From f909cfe0ceea044be18c82189ab8e4c56550a6fd Mon Sep 17 00:00:00 2001 From: arkon Date: Tue, 28 Mar 2023 18:16:43 -0400 Subject: [PATCH] Remove unnecessary withIOContext (cherry picked from commit d1bf8570797c891876b0c5fa2d9c210dc883f8a7) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt --- .../source/browse/BrowseSourceScreenModel.kt | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt index d12d43895..25a84db20 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreenModel.kt @@ -58,7 +58,6 @@ import tachiyomi.core.preference.CheckboxState import tachiyomi.core.preference.mapAsCheckboxState import tachiyomi.core.util.lang.launchIO import tachiyomi.core.util.lang.launchNonCancellable -import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat import tachiyomi.domain.UnsortedPreferences @@ -198,20 +197,18 @@ open class BrowseSourceScreenModel( // SY <-- }.flow.map { pagingData -> pagingData.map { (it, metadata) -> - withIOContext { - networkToLocalManga.await(it.toDomainManga(sourceId)) - .let { localManga -> - getManga.subscribe(localManga.url, localManga.source) - } - .filterNotNull() - .filter { localManga -> - !sourcePreferences.hideInLibraryItems().get() || !localManga.favorite - } - // SY --> - .combineMetadata(metadata) - // SY <-- - .stateIn(coroutineScope) - } + networkToLocalManga.await(it.toDomainManga(sourceId)) + .let { localManga -> + getManga.subscribe(localManga.url, localManga.source) + } + .filterNotNull() + .filter { localManga -> + !sourcePreferences.hideInLibraryItems().get() || !localManga.favorite + } + // SY --> + .combineMetadata(metadata) + // SY <-- + .stateIn(coroutineScope) } } .cachedIn(coroutineScope)