From cb265d2225eecaa899efb25c62c94df1c30c36b8 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 4 Dec 2024 16:52:51 +0700 Subject: [PATCH] fix(browse): Restart pager from controller Hopefully fix desync issue after opening an entry --- .../tachiyomi/ui/source/browse/BrowseSourceController.kt | 9 ++++----- .../tachiyomi/ui/source/browse/BrowseSourcePresenter.kt | 4 ---- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt index cf52ded8df..5a36e21dde 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourceController.kt @@ -180,11 +180,10 @@ open class BrowseSourceController(bundle: Bundle) : } return } - if (presenter.items.isNotEmpty()) { - onAddPage(1, presenter.items) - } else { - binding.progress.isVisible = true - } + + binding.progress.isVisible = true + + presenter.restartPager() } override fun onDestroyView(view: View) { diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt index 47f96e7195..96ab9fb6f3 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/source/browse/BrowseSourcePresenter.kt @@ -72,7 +72,6 @@ open class BrowseSourcePresenter( var filtersChanged = false - var items = mutableListOf() val page: Int get() = pager.currentPage @@ -129,7 +128,6 @@ open class BrowseSourcePresenter( } } filtersChanged = false - restartPager() } } @@ -172,7 +170,6 @@ open class BrowseSourcePresenter( val browseAsList = preferences.browseAsList() val sourceListType = preferences.libraryLayout() val outlineCovers = uiPreferences.outlineOnCovers() - items.clear() // Prepare the pager. pagerJob?.cancel() @@ -190,7 +187,6 @@ open class BrowseSourcePresenter( val items = mangas.map { BrowseSourceItem(it, browseAsList, sourceListType, outlineCovers) } - this@BrowseSourcePresenter.items.addAll(items) withUIContext { view?.onAddPage(page, items) } } catch (error: Exception) { Logger.e(error) { "Unable to prepare a page" }