From 878492088d078e881c832c550e570e56fb146a98 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 18 Jun 2024 11:10:10 -0300 Subject: [PATCH] Don't disable framework scheduling when not current transport --- app/src/main/java/com/stevesoltys/seedvault/App.kt | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/stevesoltys/seedvault/App.kt b/app/src/main/java/com/stevesoltys/seedvault/App.kt index 4391067f..053af85f 100644 --- a/app/src/main/java/com/stevesoltys/seedvault/App.kt +++ b/app/src/main/java/com/stevesoltys/seedvault/App.kt @@ -33,6 +33,7 @@ import com.stevesoltys.seedvault.settings.AppListRetriever import com.stevesoltys.seedvault.settings.SettingsManager import com.stevesoltys.seedvault.settings.SettingsViewModel import com.stevesoltys.seedvault.storage.storageModule +import com.stevesoltys.seedvault.transport.TRANSPORT_ID import com.stevesoltys.seedvault.transport.backup.backupModule import com.stevesoltys.seedvault.transport.restore.restoreModule import com.stevesoltys.seedvault.ui.files.FileSelectionViewModel @@ -185,12 +186,14 @@ open class App : Application() { return } - backupManager.setFrameworkSchedulingEnabledForUser(UserHandle.myUserId(), false) - if (backupManager.isBackupEnabled && !pluginManager.isOnRemovableDrive) { - AppBackupWorker.schedule(applicationContext, settingsManager, UPDATE) + if (backupManager.currentTransport == TRANSPORT_ID) { + backupManager.setFrameworkSchedulingEnabledForUser(UserHandle.myUserId(), false) + if (backupManager.isBackupEnabled && !pluginManager.isOnRemovableDrive) { + AppBackupWorker.schedule(applicationContext, settingsManager, UPDATE) + } + // cancel old D2D worker + WorkManager.getInstance(this).cancelUniqueWork("APP_BACKUP") } - // cancel old D2D worker - WorkManager.getInstance(this).cancelUniqueWork("APP_BACKUP") } private fun isFrameworkSchedulingEnabled(): Boolean = Settings.Secure.getInt(