Don't restore the storage provider app

otherwise it gets killed during data restore which kills our restore process
seedvault-app · Jun 18, 2024 · a7ec1ff · a7ec1ff
1 parent c483332
commit a7ec1ff
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/AppDataRestoreManager.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/AppDataRestoreManager.kt
@@ -24,6 +24,7 @@ import com.stevesoltys.seedvault.NO_DATA_END_SENTINEL
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.metadata.PackageMetadataMap
 import com.stevesoltys.seedvault.metadata.PackageState
+import com.stevesoltys.seedvault.plugins.StoragePluginManager
 import com.stevesoltys.seedvault.restore.install.isInstalled
 import com.stevesoltys.seedvault.settings.SettingsManager
 import com.stevesoltys.seedvault.transport.TRANSPORT_ID
@@ -54,6 +55,7 @@ internal class AppDataRestoreManager(
     private val backupManager: IBackupManager,
     private val settingsManager: SettingsManager,
     private val restoreCoordinator: RestoreCoordinator,
+    private val storagePluginManager: StoragePluginManager,
 ) {
 
     private var session: IRestoreSession? = null
@@ -97,12 +99,16 @@ internal class AppDataRestoreManager(
             return
         }
 
+        val providerPackageName = storagePluginManager.appPlugin.providerPackageName
         val observer = RestoreObserver(
             restoreCoordinator = restoreCoordinator,
             restorableBackup = restorableBackup,
             session = session,
             // sort packages (reverse) alphabetically, since we move from bottom to top
-            packages = restorableBackup.packageMetadataMap.packagesSortedByNameDescending,
+            packages = restorableBackup.packageMetadataMap.packagesSortedByNameDescending.filter {
+                // filter out current plugin package name, so it doesn't kill our restore
+                it != providerPackageName
+            },
             monitor = monitor,
         )
 

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreViewModel.kt
@@ -71,8 +71,9 @@ internal class RestoreViewModel(
 
     private val appSelectionManager =
         AppSelectionManager(app, pluginManager, iconManager, viewModelScope)
-    private val appDataRestoreManager =
-        AppDataRestoreManager(app, backupManager, settingsManager, restoreCoordinator)
+    private val appDataRestoreManager = AppDataRestoreManager(
+        app, backupManager, settingsManager, restoreCoordinator, pluginManager
+    )
 
     private val mDisplayFragment = MutableLiveEvent<DisplayFragment>()
     internal val displayFragment: LiveEvent<DisplayFragment> = mDisplayFragment