From 30a5331bbc1fc03fb4bf1ae30de5114f4b309c2c Mon Sep 17 00:00:00 2001 From: Jannik Date: Sun, 6 Mar 2022 18:57:55 +0100 Subject: [PATCH] load preferred sub/content language on startup --- .../teapod/ui/activity/main/MainActivity.kt | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt b/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt index ae99d38..9bd2b4a 100644 --- a/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt +++ b/app/src/main/java/org/mosad/teapod/ui/activity/main/MainActivity.kt @@ -44,9 +44,11 @@ import org.mosad.teapod.ui.activity.onboarding.OnboardingActivity import org.mosad.teapod.ui.activity.player.PlayerActivity import org.mosad.teapod.ui.components.LoginDialog import org.mosad.teapod.util.DataTypes +import java.util.* import kotlin.system.measureTimeMillis class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListener { + private val classTag = javaClass.name private lateinit var binding: ActivityMainBinding private var activeBaseFragment: Fragment = HomeFragment() // the currently active fragment, home at the start @@ -146,16 +148,20 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen runBlocking { initCrunchyroll().joinAll() } } } - Log.i(javaClass.name, "loading in $time ms") + Log.i(classTag, "loading in $time ms") } private fun initCrunchyroll(): List { - println("init") - val scope = CoroutineScope(Dispatchers.IO + CoroutineName("InitialLoadingScope")) return listOf( scope.launch { Crunchyroll.index() }, - scope.launch { Crunchyroll.account() } + scope.launch { Crunchyroll.account() }, + scope.launch { + // update the local preferred content language, since it may have changed + val locale = Locale.forLanguageTag(Crunchyroll.profile().preferredContentSubtitleLanguage) + Preferences.savePreferredLocal(this@MainActivity, locale) + + } ) } @@ -169,7 +175,7 @@ class MainActivity : AppCompatActivity(), NavigationBarView.OnItemSelectedListen // Log.w(javaClass.name, "Login failed, please try again.") // } }.negativeButton { - Log.i(javaClass.name, "Login canceled, exiting.") + Log.i(classTag, "Login canceled, exiting.") finish() }.show() }