From 873b41e4f90e6b5868fae7943ead545965c387cd Mon Sep 17 00:00:00 2001 From: Koitharu Date: Sat, 26 Jun 2021 15:03:04 +0300 Subject: [PATCH] Fix default languages selector --- .../koitharu/kotatsu/settings/onboard/OnboardViewModel.kt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt index 9f8d9e65a..b0f2a4ee4 100644 --- a/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt +++ b/app/src/main/java/org/koitharu/kotatsu/settings/onboard/OnboardViewModel.kt @@ -8,7 +8,6 @@ import org.koitharu.kotatsu.core.model.MangaSource import org.koitharu.kotatsu.core.prefs.AppSettings import org.koitharu.kotatsu.settings.onboard.model.SourceLocale import org.koitharu.kotatsu.utils.ext.map -import org.koitharu.kotatsu.utils.ext.mapTo import org.koitharu.kotatsu.utils.ext.mapToSet import java.util.* @@ -30,10 +29,10 @@ class OnboardViewModel( if (settings.isSourcesSelected) { selectedLocales.removeAll(settings.hiddenSources.map { x -> MangaSource.valueOf(x).locale }) } else { - LocaleListCompat.getDefault().mapTo(selectedLocales) { x -> + val deviceLocales = LocaleListCompat.getDefault().map { x -> x.language } - selectedLocales.retainAll(allSources.map { x -> x.locale }) + selectedLocales.retainAll(deviceLocales) if (selectedLocales.isEmpty()) { selectedLocales += "en" } @@ -71,7 +70,7 @@ class OnboardViewModel( }.sortedWith(SourceLocaleComparator()) } - private class SourceLocaleComparator : Comparator { + private class SourceLocaleComparator : Comparator { private val deviceLocales = LocaleListCompat.getAdjustedDefault() .map { it.language }