Fix deprecation and extract method

jellyfin · Aug 20, 2023 · 85c54fe · 85c54fe
1 parent 73157ad
commit 85c54fe
Showing 1 changed file with 32 additions and 19 deletions.
diff --git a/app/src/main/java/org/jellyfin/mobile/MainActivity.kt b/app/src/main/java/org/jellyfin/mobile/MainActivity.kt
@@ -12,7 +12,10 @@ import android.widget.Toast
 import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
+import kotlinx.coroutines.launch
 import org.jellyfin.mobile.events.ActivityEventHandler
 import org.jellyfin.mobile.player.cast.Chromecast
 import org.jellyfin.mobile.player.cast.IChromecast
@@ -84,25 +87,10 @@ class MainActivity : AppCompatActivity() {
         with(activityEventHandler) { subscribe() }
 
         // Load UI
-        lifecycleScope.launchWhenStarted {
-            mainViewModel.serverState.collect { state ->
-                with(supportFragmentManager) {
-                    when (state) {
-                        ServerState.Pending -> {
-                            // TODO add loading indicator
-                        }
-                        is ServerState.Unset -> replaceFragment<ConnectFragment>()
-                        is ServerState.Available -> {
-                            val currentFragment = findFragmentById(R.id.fragment_container)
-                            if (currentFragment !is WebViewFragment || currentFragment.server != state.server) {
-                                replaceFragment<WebViewFragment>(
-                                    Bundle().apply {
-                                        putParcelable(Constants.FRAGMENT_WEB_VIEW_EXTRA_SERVER, state.server)
-                                    },
-                                )
-                            }
-                        }
-                    }
+        lifecycleScope.launch {
+            repeatOnLifecycle(Lifecycle.State.STARTED) {
+                mainViewModel.serverState.collect { state ->
+                    handleServerState(state)
                 }
             }
         }
@@ -116,6 +104,31 @@ class MainActivity : AppCompatActivity() {
         orientationListener.enable()
     }
 
+    private fun handleServerState(state: ServerState) {
+        with(supportFragmentManager) {
+            val currentFragment = findFragmentById(R.id.fragment_container)
+            when (state) {
+                ServerState.Pending -> {
+                    // TODO add loading indicator
+                }
+                is ServerState.Unset -> {
+                    if (currentFragment !is ConnectFragment) {
+                        replaceFragment<ConnectFragment>()
+                    }
+                }
+                is ServerState.Available -> {
+                    if (currentFragment !is WebViewFragment || currentFragment.server != state.server) {
+                        replaceFragment<WebViewFragment>(
+                            Bundle().apply {
+                                putParcelable(Constants.FRAGMENT_WEB_VIEW_EXTRA_SERVER, state.server)
+                            },
+                        )
+                    }
+                }
+            }
+        }
+    }
+
     override fun onRequestPermissionsResult(
         requestCode: Int,
         permissions: Array<out String>,