diff --git a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt index 5e876ab4..09b12602 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/MainActivity.kt @@ -385,7 +385,7 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener { logError(e) } val settingsManager = PreferenceManager.getDefaultSharedPreferences(this) - if (githubApi.getLatestLoginData() != null && settingsManager.getBoolean(getString(R.string.automatic_cloud_backups), false)) { + if (githubApi.getLatestLoginData() != null && settingsManager.getBoolean(getString(R.string.automatic_cloud_backups), true)) { this@MainActivity.backupGithub() } } @@ -607,6 +607,10 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener { logError(e) } } + + if (githubApi.getLatestLoginData() != null && settingsManager.getBoolean(getString(R.string.automatic_cloud_backups), true)){ + context?.restorePromptGithub() + } } SearchResultBuilder.updateCache(this) @@ -615,10 +619,6 @@ class MainActivity : AppCompatActivity(), ColorPickerDialogListener { initAll() // No duplicates (which can happen by registerMainAPI) apis = allProviders.distinctBy { it } - - if (githubApi.getLatestLoginData() != null && settingsManager.getBoolean(getString(R.string.automatic_cloud_backups), false)){ - context?.restorePromptGithub() - } } // val navView: BottomNavigationView = findViewById(R.id.nav_view) diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt index 4b9dd5be..877e918c 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/ui/home/HomeFragment.kt @@ -121,6 +121,7 @@ class HomeFragment : Fragment() { val configEvent = Event() var currentSpan = 1 val listHomepageItems = mutableListOf() + val reloadStoredDataEvent = Event() private val errorProfilePics = listOf( R.drawable.monke_benene, @@ -471,14 +472,20 @@ class HomeFragment : Fragment() { reloadStored() afterPluginsLoadedEvent += ::firstLoadHomePage mainPluginsLoadedEvent += ::firstLoadHomePage + reloadStoredDataEvent += ::reloadStoredEvent } override fun onStop() { afterPluginsLoadedEvent -= ::firstLoadHomePage mainPluginsLoadedEvent -= ::firstLoadHomePage + reloadStoredDataEvent -= ::reloadStoredEvent super.onStop() } + private fun reloadStoredEvent(input: Unit) { + reloadStored() + } + private fun reloadStored() { homeViewModel.loadResumeWatching() val list = EnumSet.noneOf(WatchType::class.java) diff --git a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt index b20b5093..8a88b1be 100644 --- a/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt +++ b/app/src/main/java/com/lagradost/cloudstream3/utils/BackupUtils.kt @@ -32,6 +32,7 @@ import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_T import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_UNIXTIME_KEY import com.lagradost.cloudstream3.syncproviders.providers.MALApi.Companion.MAL_USER_KEY import com.lagradost.cloudstream3.syncproviders.providers.OpenSubtitlesApi.Companion.OPEN_SUBTITLES_USER_KEY +import com.lagradost.cloudstream3.ui.home.HomeFragment import com.lagradost.cloudstream3.utils.AppUtils.parseJson import com.lagradost.cloudstream3.utils.AppUtils.toJson @@ -332,5 +333,6 @@ object BackupUtils { restoreSettings = true, restoreDataStore = true ) + HomeFragment.reloadStoredDataEvent.invoke(Unit) } }