From d42cd598802a39b7b5e05a1d0a5f8bd482a838d4 Mon Sep 17 00:00:00 2001 From: Zakhar Timoshenko Date: Wed, 27 Jul 2022 23:24:41 +0300 Subject: [PATCH] Fix enabling disabled new sources Co-authored-by: Koitharu <8948226+nv95@users.noreply.github.com> --- .../settings/newsources/NewSourcesViewModel.kt | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt index 06567642b..a0e46cd2f 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/newsources/NewSourcesViewModel.kt @@ -33,15 +33,22 @@ class NewSourcesViewModel( private fun buildList() { val locales = LocaleListCompat.getDefault().mapToSet { it.language } - val hidden = settings.hiddenSources + val pendingHidden = HashSet() sources.value = initialList.map { val locale = it.locale + val isEnabledByLocale = locale == null || locale in locales + if (!isEnabledByLocale) { + pendingHidden += it.name + } SourceConfigItem.SourceItem( source = it, summary = it.getLocaleTitle(), - isEnabled = it.name !in hidden && (locale == null || locale in locales), - isDraggable = false, + isEnabled = isEnabledByLocale, + isDraggable = false ) } + if (pendingHidden.isNotEmpty()) { + settings.hiddenSources += pendingHidden + } } } \ No newline at end of file