From ba7baba449d5eb103c3c889d5c52f03d6874b722 Mon Sep 17 00:00:00 2001 From: Ahmad Ansori Palembani Date: Wed, 21 Aug 2024 19:40:27 +0700 Subject: [PATCH] revert(manga/details): Revert flow usage The value refuses to change for some reason --- CHANGELOG.md | 3 --- .../tachiyomi/ui/manga/MangaDetailsPresenter.kt | 16 +++++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 010b82fa2e..30f3c26a01 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,3 @@ --> ## Fixes - Fixed custom cover set from reader didn't show up on manga details - -## Other -- Initial migration to use Flow on MangaDetailsPresenter diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt index 7c78d9752a..85857101da 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaDetailsPresenter.kt @@ -75,8 +75,6 @@ import java.util.Locale import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.async import kotlinx.coroutines.awaitAll -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.filter import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.onEach @@ -114,11 +112,10 @@ class MangaDetailsPresenter( private val updateChapter: UpdateChapter by injectLazy() private val updateManga: UpdateManga by injectLazy() - private val currentMangaInternal: MutableStateFlow = MutableStateFlow(null) - val currentManga get() = currentMangaInternal.asStateFlow() +// private val currentMangaInternal: MutableStateFlow = MutableStateFlow(null) +// val currentManga get() = currentMangaInternal.asStateFlow() - val manga: Manga - get() = currentManga.value!! + lateinit var manga: Manga private val customMangaManager: CustomMangaManager by injectLazy() private val mangaShortcutManager: MangaShortcutManager by injectLazy() @@ -156,8 +153,8 @@ class MangaDetailsPresenter( fun onFirstLoad() { val controller = view ?: return isLockedFromSearch = controller.shouldLockIfNeeded && SecureActivityDelegate.shouldBeLocked() - if (currentManga.value == null) runBlocking { refreshMangaFromDb() } - if (currentManga.value == null) return + if (!::manga.isInitialized) runBlocking { refreshMangaFromDb() } +// if (currentManga.value == null) return syncData() downloadManager.addListener(this) LibraryUpdateJob.updateFlow @@ -198,7 +195,8 @@ class MangaDetailsPresenter( } fun setCurrentManga(manga: Manga?) { - currentMangaInternal.value = manga +// currentMangaInternal.update { manga } + this.manga = manga!! } // TODO: Use flow to "sync" data instead