bugfix on lib startup

recloudstream · Jul 5, 2024 · e1d4a46 · e1d4a46
1 parent c1b5f5c
commit e1d4a46
Showing 1 changed file with 20 additions and 17 deletions.
diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
@@ -1112,23 +1112,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
 
         MainAPI.settingsForProvider = settingsForProvider
 
-        // Change library icon with logo of current api in sync
-        libraryViewModel = ViewModelProvider(this)[LibraryViewModel::class.java]
-        libraryViewModel?.currentApiName?.observe(this) {
-            val syncAPI =  libraryViewModel?.currentSyncApi
-            Log.i("SYNC_API", "${syncAPI?.name}, ${syncAPI?.idPrefix}")
-            val icon = if (syncAPI?.idPrefix ==  localListApi.idPrefix) {
-                R.drawable.library_icon
-            } else {
-                syncAPI?.icon ?: R.drawable.library_icon
-            }
-
-            binding?.apply {
-                navRailView.menu.findItem(R.id.navigation_library)?.setIcon(icon)
-                navView.menu.findItem(R.id.navigation_library)?.setIcon(icon)
-            }
-        }
-
         loadThemes(this)
         updateLocale()
         super.onCreate(savedInstanceState)
@@ -1538,6 +1521,26 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener, BiometricCa
                     logError(e)
                 }
             }
+
+            // we need to run this after we init all apis, otherwise currentSyncApi will fuck itself
+            this@MainActivity.runOnUiThread {
+                // Change library icon with logo of current api in sync
+                libraryViewModel = ViewModelProvider(this@MainActivity)[LibraryViewModel::class.java]
+                libraryViewModel?.currentApiName?.observe(this@MainActivity) {
+                    val syncAPI =  libraryViewModel?.currentSyncApi
+                    Log.i("SYNC_API", "${syncAPI?.name}, ${syncAPI?.idPrefix}")
+                    val icon = if (syncAPI?.idPrefix ==  localListApi.idPrefix) {
+                        R.drawable.library_icon
+                    } else {
+                        syncAPI?.icon ?: R.drawable.library_icon
+                    }
+
+                    binding?.apply {
+                        navRailView.menu.findItem(R.id.navigation_library)?.setIcon(icon)
+                        navView.menu.findItem(R.id.navigation_library)?.setIcon(icon)
+                    }
+                }
+            }
         }
 
         SearchResultBuilder.updateCache(this)