diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt index 940d3391..69977f66 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainAPI.kt @@ -199,20 +199,20 @@ object APIHolder { * but it turned out too complicated and unnecessary with extensions. **/ fun Context.getApiProviderLangSettings(): HashSet { - val langs = apis.map { it.lang }.toSet() - .sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } - return langs.toHashSet() + //val langs = apis.map { it.lang }.toSet() + //.sortedBy { SubtitleHelper.fromTwoLettersToLanguage(it) } + //return langs.toHashSet() -// val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) -// val hashSet = HashSet() -// hashSet.add("en") // def is only en -// val list = settingsManager.getStringSet( -// this.getString(R.string.provider_lang_key), -// hashSet.toMutableSet() -// ) -// -// if (list.isNullOrEmpty()) return hashSet -// return list.toHashSet() + val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) + val hashSet = HashSet() + hashSet.add("en") // def is only en + val list = settingsManager.getStringSet( + this.getString(R.string.provider_lang_key), + hashSet.toMutableSet() + ) + + if (list.isNullOrEmpty()) return hashSet + return list.toHashSet() } fun Context.getApiTypeSettings(): HashSet { diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt index c4bf7580..7b7e5458 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentExtensions.kt @@ -96,7 +96,7 @@ class SetupFragmentExtensions : Fragment() { next_btt?.setOnClickListener { // Continue setup if (isSetup) - findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_media) + findNavController().navigate(R.id.action_navigation_setup_extensions_to_navigation_setup_provider_languages) else findNavController().navigate(R.id.navigation_home) } diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt index f9268d77..71472328 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/setup/SetupFragmentLanguage.kt @@ -85,7 +85,7 @@ class SetupFragmentLanguage : Fragment() { && PluginManager.getPluginsLocal().isEmpty() //&& PREBUILT_REPOSITORIES.isNotEmpty() ) R.id.action_navigation_global_to_navigation_setup_extensions - else R.id.action_navigation_setup_language_to_navigation_setup_media + else R.id.action_navigation_setup_language_to_navigation_setup_provider_languages findNavController().navigate( nextDestination, diff --git a/app/src/main/res/xml/settings_providers.xml b/app/src/main/res/xml/settings_providers.xml index 86857653..e4b30eb1 100644 --- a/app/src/main/res/xml/settings_providers.xml +++ b/app/src/main/res/xml/settings_providers.xml @@ -2,7 +2,7 @@