From 7f6c96930d68e97232e68a64647ab866f1dccefb Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 5 Aug 2022 21:48:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/item_txt_toc_rule.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/item_txt_toc_rule.xml b/app/src/main/res/layout/item_txt_toc_rule.xml index fd969afcb..6737630ef 100644 --- a/app/src/main/res/layout/item_txt_toc_rule.xml +++ b/app/src/main/res/layout/item_txt_toc_rule.xml @@ -10,13 +10,13 @@ + android:layout_height="match_parent" + android:gravity="center_vertical"> Date: Fri, 5 Aug 2022 21:50:20 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/io/legado/app/help/config/LocalConfig.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/io/legado/app/help/config/LocalConfig.kt b/app/src/main/java/io/legado/app/help/config/LocalConfig.kt index 09da7a194..99384e194 100644 --- a/app/src/main/java/io/legado/app/help/config/LocalConfig.kt +++ b/app/src/main/java/io/legado/app/help/config/LocalConfig.kt @@ -43,7 +43,7 @@ object LocalConfig : get() = !isLastVersion(5, "httpTtsVersion") val needUpTxtTocRule: Boolean - get() = !isLastVersion(1, "txtTocRuleVersion") + get() = !isLastVersion(2, "txtTocRuleVersion") val needUpRssSources: Boolean get() = !isLastVersion(4, "rssSourceVersion") From 07286ee424433100cb91de4e4edd4810aecd8739 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 5 Aug 2022 22:48:56 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/legado/app/receiver/NetworkChangedListener.kt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt b/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt index 12de57e90..b3e9af33d 100644 --- a/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt +++ b/app/src/main/java/io/legado/app/receiver/NetworkChangedListener.kt @@ -1,5 +1,6 @@ package io.legado.app.receiver +import android.annotation.SuppressLint import android.content.BroadcastReceiver import android.content.Context import android.content.Intent @@ -34,6 +35,7 @@ class NetworkChangedListener(private val context: Context) { return@lazy null } + @SuppressLint("MissingPermission") fun register() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { networkCallback?.let { From c14008543770a3bf56a7995f1d54e6353936f51f Mon Sep 17 00:00:00 2001 From: 821938089 <821938089@qq.com> Date: Sat, 6 Aug 2022 12:59:38 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../book/source/manage/BookSourceActivity.kt | 17 ++++++++++++ .../book/source/manage/BookSourceAdapter.kt | 27 +++++++++++++++++-- app/src/main/res/menu/book_source_sel.xml | 5 ++++ app/src/main/res/values-es-rES/strings.xml | 1 + app/src/main/res/values-ja-rJP/strings.xml | 1 + app/src/main/res/values-pt-rBR/strings.xml | 1 + app/src/main/res/values-zh-rHK/strings.xml | 1 + app/src/main/res/values-zh-rTW/strings.xml | 1 + app/src/main/res/values-zh/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 10 files changed, 54 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index bd9cd1cf9..37aa77e84 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.Menu import android.view.MenuItem import android.view.SubMenu +import android.view.WindowManager import androidx.activity.viewModels import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.PopupMenu @@ -363,6 +364,7 @@ class BookSourceActivity : VMBaseActivity viewModel.saveToFile(adapter.selection) { share(it) } + R.id.menu_check_selected_interval -> adapter.checkSelectedInterval() } return true } @@ -376,6 +378,7 @@ class BookSourceActivity : VMBaseActivity(EventBus.CHECK_SOURCE_DONE) { + keepScreenOn(false) snackBar?.dismiss() snackBar = null groups.map { group -> @@ -524,6 +528,19 @@ class BookSourceActivity : VMBaseActivity() + private val selectedPosition = linkedSetOf() val selection: List get() { @@ -141,8 +143,10 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : if (view.isPressed) { if (checked) { selected.add(it) + selectedPosition.add(holder.layoutPosition) } else { selected.remove(it) + selectedPosition.remove(holder.layoutPosition) } callBack.upCountView() } @@ -215,25 +219,42 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : } fun selectAll() { - getItems().forEach { + getItems().forEachIndexed { index, it -> selected.add(it) + selectedPosition.add(index) } notifyItemRangeChanged(0, itemCount, bundleOf(Pair("selected", null))) callBack.upCountView() } fun revertSelection() { - getItems().forEach { + getItems().forEachIndexed { index, it -> if (selected.contains(it)) { selected.remove(it) + selectedPosition.remove(index) } else { selected.add(it) + selectedPosition.add(index) } } notifyItemRangeChanged(0, itemCount, bundleOf(Pair("selected", null))) callBack.upCountView() } + fun checkSelectedInterval() { + val minPosition = Collections.min(selectedPosition) + val maxPosition = Collections.max(selectedPosition) + val itemCount = maxPosition - minPosition + 1 + for (i in minPosition..maxPosition) { + getItem(i)?.let { + selected.add(it) + selectedPosition.add(i) + } + } + notifyItemRangeChanged(minPosition, itemCount, bundleOf(Pair("selected", null))) + callBack.upCountView() + } + override fun swap(srcPosition: Int, targetPosition: Int): Boolean { val srcItem = getItem(srcPosition) val targetItem = getItem(targetPosition) @@ -275,8 +296,10 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : getItem(position)?.let { if (isSelected) { selected.add(it) + selectedPosition.add(position) } else { selected.remove(it) + selectedPosition.remove(position) } notifyItemChanged(position, bundleOf(Pair("selected", null))) callBack.upCountView() diff --git a/app/src/main/res/menu/book_source_sel.xml b/app/src/main/res/menu/book_source_sel.xml index f73160d90..3fd99868c 100644 --- a/app/src/main/res/menu/book_source_sel.xml +++ b/app/src/main/res/menu/book_source_sel.xml @@ -58,4 +58,9 @@ android:title="@string/check_select_source" app:showAsAction="never" /> + + diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 1b8b20c70..2a7ff5263 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1007,4 +1007,5 @@ 滑动翻页阈值（0 = 系统默认值） 滑动多长距离才会触发滑动翻页（系统默认值 %s px） Ejemplo + 选中所选区间 diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index 3ab62635c..67ffe8fd9 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -1010,4 +1010,5 @@ 滑动翻页阈值（0 = 系统默认值） 滑动多长距离才会触发滑动翻页（系统默认值 %s px） 例 + 选中所选区间 diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7c11db47e..60d2886bd 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1010,4 +1010,5 @@ 滑动翻页阈值（0 = 系统默认值） 滑动多长距离才会触发滑动翻页（系统默认值 %s px） Exemplo + 选中所选区间 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 99a15125e..34ba2a46a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -1007,4 +1007,5 @@ 滑动翻页阈值（0 = 系统默认值） 滑动多长距离才会触发滑动翻页（系统默认值 %s px） 示例 + 选中所选区间 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 928a00828..7b8de3a1b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1009,4 +1009,5 @@ 滑动翻页阈值（0 = 系统默认值） 滑动多长距离才会触发滑动翻页（系统默认值 %s px） 示例 + 选中所选区间 diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index e395e543c..de1f51ece 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1009,4 +1009,5 @@ 滑动翻页阈值（0 = 系统默认值） 滑动多长距离才会触发滑动翻页（系统默认值 %s px） 示例 + 选中所选区间 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3b1824116..18656565b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1010,4 +1010,5 @@ 滑动翻页阈值 滑动翻页阈值（0 = 系统默认值） 滑动多长距离才会触发滑动翻页（系统默认值 %s px） + 选中所选区间 From 270030c3be8146ca37d3d8a51d885c5b9da516fc Mon Sep 17 00:00:00 2001 From: 821938089 <821938089@qq.com> Date: Sat, 6 Aug 2022 19:45:29 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/base/BaseService.kt | 8 +++----- .../io/legado/app/help/coroutine/Coroutine.kt | 10 ++++++++-- .../legado/app/service/CheckSourceService.kt | 10 ++++------ .../book/source/manage/BookSourceActivity.kt | 2 +- .../book/source/manage/BookSourceAdapter.kt | 19 ++++++++----------- 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/io/legado/app/base/BaseService.kt b/app/src/main/java/io/legado/app/base/BaseService.kt index 54b409f39..852dc0d5f 100644 --- a/app/src/main/java/io/legado/app/base/BaseService.kt +++ b/app/src/main/java/io/legado/app/base/BaseService.kt @@ -6,10 +6,7 @@ import android.os.IBinder import androidx.annotation.CallSuper import io.legado.app.help.LifecycleHelp import io.legado.app.help.coroutine.Coroutine -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.MainScope -import kotlinx.coroutines.cancel +import kotlinx.coroutines.* import kotlin.coroutines.CoroutineContext abstract class BaseService : Service(), CoroutineScope by MainScope() { @@ -17,8 +14,9 @@ abstract class BaseService : Service(), CoroutineScope by MainScope() { fun execute( scope: CoroutineScope = this, context: CoroutineContext = Dispatchers.IO, + start: CoroutineStart = CoroutineStart.DEFAULT, block: suspend CoroutineScope.() -> T - ) = Coroutine.async(scope, context) { block() } + ) = Coroutine.async(scope, context, start) { block() } @CallSuper override fun onCreate() { diff --git a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt index 73f8f9edf..a1f1c08cf 100644 --- a/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt +++ b/app/src/main/java/io/legado/app/help/coroutine/Coroutine.kt @@ -12,6 +12,7 @@ import kotlin.coroutines.CoroutineContext class Coroutine( val scope: CoroutineScope, context: CoroutineContext = Dispatchers.IO, + val startOption: CoroutineStart = CoroutineStart.DEFAULT, block: suspend CoroutineScope.() -> T ) { @@ -22,9 +23,10 @@ class Coroutine( fun async( scope: CoroutineScope = DEFAULT, context: CoroutineContext = Dispatchers.IO, + start: CoroutineStart = CoroutineStart.DEFAULT, block: suspend CoroutineScope.() -> T ): Coroutine { - return Coroutine(scope, context, block) + return Coroutine(scope, context, start, block) } } @@ -135,11 +137,15 @@ class Coroutine( return job.invokeOnCompletion(handler) } + fun start() { + job.start() + } + private fun executeInternal( context: CoroutineContext, block: suspend CoroutineScope.() -> T ): Job { - return (scope + Dispatchers.Main).launch { + return (scope + Dispatchers.Main).launch(start = startOption) { try { start?.let { dispatchVoidCallback(this, it) } ensureActive() diff --git a/app/src/main/java/io/legado/app/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt index 62637d428..44c3de4b6 100644 --- a/app/src/main/java/io/legado/app/service/CheckSourceService.kt +++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt @@ -24,10 +24,8 @@ import io.legado.app.utils.activityPendingIntent import io.legado.app.utils.postEvent import io.legado.app.utils.servicePendingIntent import io.legado.app.utils.toastOnUi +import kotlinx.coroutines.* import kotlinx.coroutines.Dispatchers.IO -import kotlinx.coroutines.TimeoutCancellationException -import kotlinx.coroutines.asCoroutineDispatcher -import kotlinx.coroutines.launch import org.mozilla.javascript.WrappedException import java.util.concurrent.Executors import kotlin.math.min @@ -122,7 +120,7 @@ class CheckSourceService : BaseService() { *校验书源 */ private fun check(source: BookSource) { - execute(context = searchCoroutine) { + execute(context = searchCoroutine, start = CoroutineStart.LAZY) { Debug.startChecking(source) var searchWord = CheckSource.keyword source.ruleSearch?.checkKeyWord?.let { @@ -162,7 +160,7 @@ class CheckSourceService : BaseService() { } } if (url.isNullOrBlank()) { - source.addGroup("发现规则为空") + source.addGroup("发现规则为空") } else { source.removeGroup("发现规则为空") val exploreBooks = WebBook.exploreBookAwait(this, source, url) @@ -194,7 +192,7 @@ class CheckSourceService : BaseService() { source.respondTime = Debug.getRespondTime(source.bookSourceUrl) appDb.bookSourceDao.update(source) onNext(source.bookSourceUrl, source.bookSourceName) - } + }.start() } /** diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index 37aa77e84..02f750699 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -531,7 +531,7 @@ class BookSourceActivity : VMBaseActivity() - private val selectedPosition = linkedSetOf() val selection: List get() { @@ -143,10 +142,8 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : if (view.isPressed) { if (checked) { selected.add(it) - selectedPosition.add(holder.layoutPosition) } else { selected.remove(it) - selectedPosition.remove(holder.layoutPosition) } callBack.upCountView() } @@ -219,22 +216,19 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : } fun selectAll() { - getItems().forEachIndexed { index, it -> + getItems().forEach { selected.add(it) - selectedPosition.add(index) } notifyItemRangeChanged(0, itemCount, bundleOf(Pair("selected", null))) callBack.upCountView() } fun revertSelection() { - getItems().forEachIndexed { index, it -> + getItems().forEach { if (selected.contains(it)) { selected.remove(it) - selectedPosition.remove(index) } else { selected.add(it) - selectedPosition.add(index) } } notifyItemRangeChanged(0, itemCount, bundleOf(Pair("selected", null))) @@ -242,13 +236,18 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : } fun checkSelectedInterval() { + val selectedPosition = linkedSetOf() + getItems().forEachIndexed { index, it -> + if (selected.contains(it)) { + selectedPosition.add(index) + } + } val minPosition = Collections.min(selectedPosition) val maxPosition = Collections.max(selectedPosition) val itemCount = maxPosition - minPosition + 1 for (i in minPosition..maxPosition) { getItem(i)?.let { selected.add(it) - selectedPosition.add(i) } } notifyItemRangeChanged(minPosition, itemCount, bundleOf(Pair("selected", null))) @@ -296,10 +295,8 @@ class BookSourceAdapter(context: Context, val callBack: CallBack) : getItem(position)?.let { if (isSelected) { selected.add(it) - selectedPosition.add(position) } else { selected.remove(it) - selectedPosition.remove(position) } notifyItemChanged(position, bundleOf(Pair("selected", null))) callBack.upCountView() From 69e365bc065f0a6b3a9272250024626ccceed92f Mon Sep 17 00:00:00 2001 From: 821938089 <821938089@qq.com> Date: Sun, 7 Aug 2022 19:58:52 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/legado/app/model/CheckSource.kt | 6 +++ .../legado/app/service/CheckSourceService.kt | 1 + .../book/source/manage/BookSourceActivity.kt | 51 +++++++++++++++---- 3 files changed, 48 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/io/legado/app/model/CheckSource.kt b/app/src/main/java/io/legado/app/model/CheckSource.kt index e3d313bca..c43aafe33 100644 --- a/app/src/main/java/io/legado/app/model/CheckSource.kt +++ b/app/src/main/java/io/legado/app/model/CheckSource.kt @@ -38,6 +38,12 @@ object CheckSource { } } + fun resume(context: Context) { + context.startService { + action = IntentAction.resume + } + } + fun putConfig() { CacheManager.put("checkSourceTimeout", timeout) CacheManager.put("checkSearch", checkSearch) diff --git a/app/src/main/java/io/legado/app/service/CheckSourceService.kt b/app/src/main/java/io/legado/app/service/CheckSourceService.kt index 44c3de4b6..bb92871fc 100644 --- a/app/src/main/java/io/legado/app/service/CheckSourceService.kt +++ b/app/src/main/java/io/legado/app/service/CheckSourceService.kt @@ -69,6 +69,7 @@ class CheckSourceService : BaseService() { IntentAction.start -> intent.getStringArrayListExtra("selectIds")?.let { check(it) } + IntentAction.resume -> upNotification() else -> stopSelf() } return super.onStartCommand(intent, flags, startId) diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index 02f750699..6f79b5d5c 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -1,11 +1,10 @@ package io.legado.app.ui.book.source.manage import android.annotation.SuppressLint +import android.content.Context +import android.hardware.display.DisplayManager import android.os.Bundle -import android.view.Menu -import android.view.MenuItem -import android.view.SubMenu -import android.view.WindowManager +import android.view.* import androidx.activity.viewModels import androidx.appcompat.app.AlertDialog import androidx.appcompat.widget.PopupMenu @@ -29,6 +28,7 @@ import io.legado.app.lib.theme.primaryColor import io.legado.app.lib.theme.primaryTextColor import io.legado.app.model.CheckSource import io.legado.app.model.Debug +import io.legado.app.service.CheckSourceService import io.legado.app.ui.association.ImportBookSourceDialog import io.legado.app.ui.book.local.rule.TxtTocRuleActivity import io.legado.app.ui.book.source.debug.BookSourceDebugActivity @@ -70,6 +70,9 @@ class BookSourceActivity : VMBaseActivity Date: Mon, 8 Aug 2022 22:29:44 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/me/ag2s/epublib/epub/EpubReader.java | 6 ++---- .../main/java/me/ag2s/epublib/epub/ResourcesLoader.java | 8 +++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/EpubReader.java b/epublib/src/main/java/me/ag2s/epublib/epub/EpubReader.java index 21a2b2e17..7f74b836f 100644 --- a/epublib/src/main/java/me/ag2s/epublib/epub/EpubReader.java +++ b/epublib/src/main/java/me/ag2s/epublib/epub/EpubReader.java @@ -69,8 +69,7 @@ public class EpubReader { */ public EpubBook readEpubLazy(@NonNull ZipFile zipFile, @NonNull String encoding) throws IOException { - return readEpubLazy(zipFile, encoding, - Arrays.asList(MediaTypes.mediaTypes)); + return readEpubLazy(zipFile, encoding, Arrays.asList(MediaTypes.mediaTypes)); } public EpubBook readEpub(@NonNull ZipInputStream in, @NonNull String encoding) throws IOException { @@ -107,8 +106,7 @@ public class EpubReader { } handleMimeType(result, resources); String packageResourceHref = getPackageResourceHref(resources); - Resource packageResource = processPackageResource(packageResourceHref, - result, resources); + Resource packageResource = processPackageResource(packageResourceHref, result, resources); result.setOpfResource(packageResource); Resource ncxResource = processNcxResource(packageResource, result); result.setNcxResource(ncxResource); diff --git a/epublib/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java b/epublib/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java index 058299db2..8c8bdd72e 100644 --- a/epublib/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java +++ b/epublib/src/main/java/me/ag2s/epublib/epub/ResourcesLoader.java @@ -46,9 +46,11 @@ public class ResourcesLoader { * @return Resources * @throws IOException IOException */ - public static Resources loadResources(ZipFile zipFile, - String defaultHtmlEncoding, - List lazyLoadedTypes) throws IOException { + public static Resources loadResources( + ZipFile zipFile, + String defaultHtmlEncoding, + List lazyLoadedTypes + ) throws IOException { LazyResourceProvider resourceProvider = new EpubResourceProvider(zipFile.getName());