From ef00925dddf4a56adbd5ff3512522d39925cdf7c Mon Sep 17 00:00:00 2001 From: arkon Date: Sun, 5 Mar 2023 11:07:33 -0500 Subject: [PATCH] Show proper message when doing global update Fixes #9170 (cherry picked from commit 9caa0d147b9d993daf173dbd7d756ab3372943bc) # Conflicts: # app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt --- .../java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt index 2d24d73cd..8546a7cea 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt @@ -101,11 +101,11 @@ object LibraryTab : Tab { val snackbarHostState = remember { SnackbarHostState() } - val onClickRefresh: (Category?) -> Boolean = { + val onClickRefresh: (Category?) -> Boolean = { category -> // SY --> val started = LibraryUpdateJob.startNow( context = context, - category = if (state.groupType == LibraryGroup.BY_DEFAULT) it else null, + category = if (state.groupType == LibraryGroup.BY_DEFAULT) category else null, group = state.groupType, groupExtra = when (state.groupType) { LibraryGroup.BY_DEFAULT -> null @@ -116,7 +116,11 @@ object LibraryTab : Tab { ) // SY <-- scope.launch { - val msgRes = if (started) R.string.updating_category else R.string.update_already_running + val msgRes = when { + !started -> R.string.update_already_running + category != null -> R.string.updating_category + else -> R.string.updating_library + } snackbarHostState.showSnackbar(context.getString(msgRes)) } started