From eeed0720f76a6b51e6c5323e61cfb2412ba513fe Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 16 Feb 2023 09:21:14 +0800
Subject: [PATCH] Resolve #814

---
 .../java/eu/kanade/tachiyomi/ui/reader/loader/PageLoader.kt   | 4 ++--
 .../tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt    | 3 ++-
 .../tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt      | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

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 ce629d10d..f7accd82a 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
@@ -61,8 +61,8 @@ abstract class PageLoader {
 
     protected abstract fun onForceRequest(index: Int)
 
-    fun cancelRequest(index: Int) {
-        onCancelRequest(index)
+    fun cancelRequest(page: ReaderPage) {
+        onCancelRequest(mPages.indexOf(page))
     }
 
     protected abstract fun onCancelRequest(index: Int)
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
index d8b64431c..0db6347b9 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/pager/PagerViewerAdapter.kt
@@ -62,7 +62,8 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() {
     }
 
     override fun destroyView(container: ViewGroup, position: Int, view: View) {
-        currentChapter?.cancelRequest(position)
+        val item = items[position]
+        currentChapter?.cancelRequest(item as ReaderPage)
     }
 
     /**
diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt
index 5f9da8160..d62092b5e 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt
@@ -84,10 +84,11 @@ class WebtoonAdapter(val viewer: WebtoonViewer) : RecyclerView.Adapter<RecyclerV
      * Recycles an existing view [holder] before adding it to the view pool.
      */
     override fun onViewRecycled(holder: RecyclerView.ViewHolder) {
-        currentChapter?.cancelRequest(holder.bindingAdapterPosition)
         when (holder) {
             is WebtoonPageHolder -> holder.recycle()
         }
+        val item = items.getOrNull(holder.bindingAdapterPosition) ?: return
+        currentChapter?.cancelRequest(item as ReaderPage)
     }
 }