Fix enabling disabled new sources
Co-authored-by: Koitharu <8948226+nv95@users.noreply.github.com>
This commit is contained in:
committed by
Koitharu
parent
be19c32fea
commit
d42cd59880
@@ -33,15 +33,22 @@ class NewSourcesViewModel(
|
|||||||
|
|
||||||
private fun buildList() {
|
private fun buildList() {
|
||||||
val locales = LocaleListCompat.getDefault().mapToSet { it.language }
|
val locales = LocaleListCompat.getDefault().mapToSet { it.language }
|
||||||
val hidden = settings.hiddenSources
|
val pendingHidden = HashSet<String>()
|
||||||
sources.value = initialList.map {
|
sources.value = initialList.map {
|
||||||
val locale = it.locale
|
val locale = it.locale
|
||||||
|
val isEnabledByLocale = locale == null || locale in locales
|
||||||
|
if (!isEnabledByLocale) {
|
||||||
|
pendingHidden += it.name
|
||||||
|
}
|
||||||
SourceConfigItem.SourceItem(
|
SourceConfigItem.SourceItem(
|
||||||
source = it,
|
source = it,
|
||||||
summary = it.getLocaleTitle(),
|
summary = it.getLocaleTitle(),
|
||||||
isEnabled = it.name !in hidden && (locale == null || locale in locales),
|
isEnabled = isEnabledByLocale,
|
||||||
isDraggable = false,
|
isDraggable = false
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
if (pendingHidden.isNotEmpty()) {
|
||||||
|
settings.hiddenSources += pendingHidden
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user