From 34be285510ff02bf01d0d6a1cbb02f0f9258bd68 Mon Sep 17 00:00:00 2001
From: FooIbar <118464521+FooIbar@users.noreply.github.com>
Date: Sun, 18 Dec 2022 08:42:30 +0800
Subject: [PATCH] Do not add neighbors on page success

Might resolve #536 #540
---
 .../main/java/com/hippo/ehviewer/gallery/EhPageLoader.java  | 6 ++++--
 .../main/java/com/hippo/ehviewer/spider/SpiderQueen.java    | 4 ++--
 .../java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt | 4 ----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java
index 2aaf55bad..bec6d60c2 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/EhPageLoader.java
@@ -126,7 +126,7 @@ public class EhPageLoader extends PageLoader2 implements SpiderQueen.OnSpiderLis
     @Override
     protected void onRequest(int index) {
         if (mSpiderQueen != null) {
-            Object object = mSpiderQueen.request(index);
+            Object object = mSpiderQueen.request(index, true);
             if (object instanceof Float) {
                 notifyPagePercent(index, (Float) object);
             } else if (object instanceof String) {
@@ -186,7 +186,9 @@ public class EhPageLoader extends PageLoader2 implements SpiderQueen.OnSpiderLis
 
     @Override
     public void onPageSuccess(int index, int finished, int downloaded, int total) {
-        notifyDataChanged(index);
+        if (mSpiderQueen != null) {
+            mSpiderQueen.request(index, false);
+        }
     }
 
     @Override
diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java
index cbb5f0964..3a5442c48 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java
+++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java
@@ -418,8 +418,8 @@ public final class SpiderQueen implements Runnable {
         return request(index, true, true, false);
     }
 
-    public Object request(int index) {
-        return request(index, true, false, true);
+    public Object request(int index, boolean addNeighbor) {
+        return request(index, true, false, addNeighbor);
     }
 
     private int getPageState(int index) {
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 db4b3b248..f5ccdd848 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
@@ -42,10 +42,6 @@ abstract class PageLoader {
             state.compareAndSet(STATE_WAIT, STATE_READY)
     }
 
-    fun notifyDataChanged(index: Int) {
-        onRequest(index)
-    }
-
     fun notifyPageWait(index: Int) {
         mPages[index].status.value = Page.State.QUEUE
     }