recloudstream/cloudstream
3
3
Fork 1
mirror of https://github.com/recloudstream/cloudstream.git synced 2024-08-15 01:53:11 +00:00
Code Issues Releases Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
Blatzar 2022-08-14 18:13:44 +02:00
parent d64bf911e8
commit 18f1fba047
1 changed files with 34 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt
View file

@ -447,13 +447,15 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
changeStatusBarState(isEmulatorSettings()) changeStatusBarState(isEmulatorSettings())
ioSafe {
if (settingsManager.getBoolean(getString(R.string.auto_update_plugins_key), true)) { if (settingsManager.getBoolean(getString(R.string.auto_update_plugins_key), true)) {
PluginManager.updateAllOnlinePluginsAndLoadThem(this) PluginManager.updateAllOnlinePluginsAndLoadThem(this@MainActivity)
} else { } else {
PluginManager.loadAllOnlinePlugins(this) PluginManager.loadAllOnlinePlugins(this@MainActivity)
} }
PluginManager.loadAllLocalPlugins(this) PluginManager.loadAllLocalPlugins(this@MainActivity)
}
// ioSafe { // ioSafe {
// val plugins = // val plugins =
@ -466,9 +468,11 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
// } // }
// init accounts // init accounts
ioSafe {
for (api in accountManagers) { for (api in accountManagers) {
api.init() api.init()
} }
}
ioSafe { ioSafe {
inAppAuths.apmap { api -> inAppAuths.apmap { api ->
@ -482,7 +486,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
SearchResultBuilder.updateCache(this) SearchResultBuilder.updateCache(this)
ioSafe {
initAll() initAll()
apis = allProviders apis = allProviders
@ -505,6 +509,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener {
} catch (e: Exception) { } catch (e: Exception) {
logError(e) logError(e)
} }
}
// val navView: BottomNavigationView = findViewById(R.id.nav_view) // val navView: BottomNavigationView = findViewById(R.id.nav_view)
setUpBackup() setUpBackup()