Release 1.8.6.0-alpha03

Revert "Resolve #795"

This reverts commit d6939b2913.

app/build.gradle.kts

@@ -35,7 +35,7 @@ android {
         minSdk = 28
         targetSdk = 33
         versionCode = 180031
-        versionName = "1.8.6.0-alpha01"
+        versionName = "1.8.6.0-alpha03"
         resourceConfigurations.addAll(
             listOf(
                 "zh",

app/src/main/java/com/hippo/ehviewer/gallery/PageLoader2.java

@@ -28,7 +28,6 @@ public abstract class PageLoader2 extends PageLoader {
     // With dot
     public static final String[] SUPPORT_IMAGE_EXTENSIONS = {
             ".jpg", // Joint Photographic Experts Group
-            ".jpeg",
             ".png", // Portable Network Graphics
             ".gif", // Graphics Interchange Format
     };

app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java

@@ -262,7 +262,7 @@ public final class SpiderQueen implements Runnable {
         }
     }
 
-    private boolean shouldIntoDownload = false;
+    private boolean mInDownloadMode = false;
 
     private void updateMode() {
         int mode;
@@ -277,7 +277,7 @@ public final class SpiderQueen implements Runnable {
         // Update download page
         boolean intoDownloadMode = mode == MODE_DOWNLOAD;
 
-        if (intoDownloadMode && mPageStateArray != null) {
+        if (intoDownloadMode && !mInDownloadMode && mPageStateArray != null) {
             // Clear download state
             synchronized (mPageStateLock) {
                 int[] temp = mPageStateArray;
@@ -292,9 +292,9 @@ public final class SpiderQueen implements Runnable {
                 mPageErrorMap.clear();
                 mPagePercentMap.clear();
             }
-        } else if (intoDownloadMode && mPageStateArray == null) {
-            shouldIntoDownload = true;
         }
+
+        mInDownloadMode = intoDownloadMode;
     }
 
     private void setMode(@Mode int mode) {
@@ -631,7 +631,7 @@ public final class SpiderQueen implements Runnable {
         // Notify get pages
         notifyGetPages(spiderInfo.getPages());
 
-        if (shouldIntoDownload) mWorkerScope.enterDownloadMode();
+        if (mInDownloadMode) mWorkerScope.enterDownloadMode();
 
         // Wait finish
         synchronized (mQueenLock) {

app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt

@@ -104,7 +104,6 @@ class SpiderQueenWorker(private val queen: SpiderQueen) : CoroutineScope {
             return queen.updatePageState(index, STATE_FINISHED)
         }
         if (force) {
-            spiderDen.remove(index)
             pTokenLock.withLock {
                 val pToken = spiderInfo.pTokenMap[index]
                 if (pToken == TOKEN_FAILED) spiderInfo.pTokenMap.remove(index)