From d7438a26fb78259a275333a63d7c4edfda3e9cb6 Mon Sep 17 00:00:00 2001 From: tarsin Date: Fri, 17 Feb 2023 15:18:09 +0800 Subject: [PATCH] Get rid of PageLoader state, convert to readyOrDie --- .../java/com/hippo/ehviewer/gallery/ArchivePageLoader.java | 3 +-- .../java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.java b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.java index b208d06af..e6d8e3923 100644 --- a/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.java +++ b/app/src/main/java/com/hippo/ehviewer/gallery/ArchivePageLoader.java @@ -67,7 +67,7 @@ public class ArchivePageLoader extends PageLoader2 { new Thread(new DecodeTask()) }; private Thread archiveThread; - private volatile int size = PageLoader.STATE_WAIT; + private volatile int size = 0; private String error; public ArchivePageLoader(Context context, Uri uri) { @@ -230,7 +230,6 @@ public class ArchivePageLoader extends PageLoader2 { size = 0; } if (size <= 0) { - size = PageLoader.STATE_ERROR; error = GetText.getString(R.string.error_reading_failed); return; } diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt index 9c3cd7b37..5d6520f9d 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt @@ -114,10 +114,4 @@ abstract class PageLoader { private const val MIN_CACHE_SIZE = (128 * 1024 * 1024).toLong() } } - - companion object { - const val STATE_WAIT = -1 - const val STATE_ERROR = -2 - const val STATE_READY = -3 - } }