From d7b08a018141cd6b2a9cd1d812f12dc1c1d8e582 Mon Sep 17 00:00:00 2001 From: tarsin Date: Tue, 14 Feb 2023 15:35:04 +0800 Subject: [PATCH] Readaround logic tweaks --- .../java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt | 8 -------- .../ui/reader/viewer/pager/PagerViewerAdapter.kt | 4 +--- .../tachiyomi/ui/reader/viewer/webtoon/WebtoonAdapter.kt | 1 - 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt index 6859a1367..2393583ac 100644 --- a/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt +++ b/app/src/main/java/com/hippo/ehviewer/spider/SpiderQueenWorker.kt @@ -63,14 +63,6 @@ class SpiderQueenWorker(private val queen: SpiderQueen) : CoroutineScope { fun updateRAList(list: List) { if (isDownloadMode) return synchronized(mFetcherJobMap) { - sequence { - mFetcherJobMap.forEach { (i, job) -> - if (i !in list) { - job.cancel() - } - if (!job.isActive) yield(i) - } - }.toSet().forEach { mFetcherJobMap.remove(it) } list.forEach { if (mFetcherJobMap[it]?.isActive != true) doLaunchDownloadJob(it, false) 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..be5200432 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 @@ -61,9 +61,7 @@ class PagerViewerAdapter(private val viewer: PagerViewer) : ViewPagerAdapter() { } } - override fun destroyView(container: ViewGroup, position: Int, view: View) { - currentChapter?.cancelRequest(position) - } + override fun destroyView(container: ViewGroup, position: Int, view: View) {} /** * Returns the current position of the given [view] on the adapter. 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..73893bf21 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,7 +84,6 @@ class WebtoonAdapter(val viewer: WebtoonViewer) : RecyclerView.Adapter holder.recycle() }