Also look for file backups when testing backup location for restore

Author: grote

app/src/main/java/com/stevesoltys/seedvault/backend/saf/SafHandler.kt

@@ -53,12 +53,12 @@ internal class SafHandler(
     }
 
     /**
-     * Searches if there's really an app backup available in the given storage location.
+     * Searches if there's really an backup available in the given storage location.
      * Returns true if at least one was found and false otherwise.
      */
     @WorkerThread
     @Throws(IOException::class)
-    suspend fun hasAppBackup(safProperties: SafProperties): Boolean {
+    suspend fun hasBackup(safProperties: SafProperties): Boolean {
         val context = context.getStorageContext { safProperties.isUsb }
         val backend = backendFactory.createSafBackend(context, safProperties)
         return backend.getAvailableBackupFileHandles().isNotEmpty()

app/src/main/java/com/stevesoltys/seedvault/backend/webdav/WebDavHandler.kt

@@ -73,12 +73,12 @@ internal class WebDavHandler(
     }
 
     /**
-     * Searches if there's really an app backup available in the given storage location.
+     * Searches if there's really a backup available in the given storage location.
      * Returns true if at least one was found and false otherwise.
      */
     @WorkerThread
     @Throws(IOException::class)
-    suspend fun hasAppBackup(backend: Backend): Boolean {
+    suspend fun hasBackup(backend: Backend): Boolean {
         return backend.getAvailableBackupFileHandles().isNotEmpty()
     }
 

app/src/main/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinator.kt

@@ -80,7 +80,9 @@ internal class RestoreCoordinator(
     suspend fun getAvailableBackups(): RestorableBackupResult {
         Log.i(TAG, "getAvailableBackups")
         val fileHandles = try {
-            backend.getAvailableBackupFileHandles()
+            backend.getAvailableBackupFileHandles().filter {
+                it is AppBackupFileType.Snapshot || it is LegacyAppBackupFile.Metadata
+            }
         } catch (e: Exception) {
             Log.e(TAG, "Error getting available backups.", e)
             return RestorableBackupResult.ErrorResult(e)

app/src/main/java/com/stevesoltys/seedvault/ui/storage/RestoreStorageViewModel.kt

@@ -35,7 +35,7 @@ internal class RestoreStorageViewModel(
     override fun onSafUriSet(safProperties: SafProperties) {
         viewModelScope.launch(Dispatchers.IO) {
             val hasBackup = try {
-                safHandler.hasAppBackup(safProperties)
+                safHandler.hasBackup(safProperties)
             } catch (e: Exception) {
                 Log.e(TAG, "Error reading URI: ${safProperties.uri}", e)
                 val errorMsg = app.getString(R.string.restore_set_error) + "\n\n$e"
@@ -60,7 +60,7 @@ internal class RestoreStorageViewModel(
     override fun onWebDavConfigSet(properties: WebDavProperties, backend: Backend) {
         viewModelScope.launch(Dispatchers.IO) {
             val hasBackup = try {
-                webdavHandler.hasAppBackup(backend)
+                webdavHandler.hasBackup(backend)
             } catch (e: Exception) {
                 Log.e(TAG, "Error reading: ${properties.config.url}", e)
                 val errorMsg = app.getString(R.string.restore_set_error) + "\n\n$e"

app/src/test/java/com/stevesoltys/seedvault/transport/restore/RestoreCoordinatorTest.kt

@@ -21,6 +21,7 @@ import com.stevesoltys.seedvault.header.VERSION
 import com.stevesoltys.seedvault.metadata.BackupType
 import com.stevesoltys.seedvault.metadata.MetadataReader
 import com.stevesoltys.seedvault.metadata.PackageMetadata
+import com.stevesoltys.seedvault.proto.Snapshot
 import com.stevesoltys.seedvault.proto.copy
 import com.stevesoltys.seedvault.repo.SnapshotManager
 import com.stevesoltys.seedvault.transport.TransportTest
@@ -35,6 +36,7 @@ import io.mockk.verify
 import kotlinx.coroutines.runBlocking
 import org.calyxos.seedvault.core.backends.AppBackupFileType
 import org.calyxos.seedvault.core.backends.Backend
+import org.calyxos.seedvault.core.backends.FileBackupFileType
 import org.calyxos.seedvault.core.backends.FileInfo
 import org.calyxos.seedvault.core.backends.LegacyAppBackupFile
 import org.calyxos.seedvault.core.backends.saf.SafProperties
@@ -96,16 +98,22 @@ internal class RestoreCoordinatorTest : TransportTest() {
     fun `getAvailableRestoreSets() builds set from plugin response`() = runBlocking {
         val handle1 = LegacyAppBackupFile.Metadata(token)
         val handle2 = LegacyAppBackupFile.Metadata(token + 1)
+        val handle3 = AppBackupFileType.Snapshot("foo", "bar")
+        // last handle should get ignored
+        val handle4 = FileBackupFileType.Snapshot("foodi", token + 2)
 
-        coEvery { backend.getAvailableBackupFileHandles() } returns listOf(handle1, handle2)
+        coEvery {
+            backend.getAvailableBackupFileHandles()
+        } returns listOf(handle1, handle2, handle3, handle4)
         coEvery { backend.load(handle1) } returns inputStream
         coEvery { backend.load(handle2) } returns inputStream
+        coEvery { snapshotManager.loadSnapshot(handle3) } returns mockk<Snapshot>(relaxed = true)
         every { metadataReader.readMetadata(inputStream, token) } returns metadata
         every { metadataReader.readMetadata(inputStream, token + 1) } returns metadata
         every { inputStream.close() } just Runs
 
         val sets = restore.getAvailableRestoreSets() ?: fail()
-        assertEquals(2, sets.size)
+        assertEquals(3, sets.size) // file backup snapshot handle4 is ignored
         assertEquals(metadata.deviceName, sets[0].device)
         assertEquals(metadata.deviceName, sets[0].name)
         assertEquals(metadata.token, sets[0].token)
@@ -114,7 +122,7 @@ internal class RestoreCoordinatorTest : TransportTest() {
         every { metadataReader.readMetadata(inputStream, token + 1) } returns d2dMetadata
 
         val d2dSets = restore.getAvailableRestoreSets() ?: fail()
-        assertEquals(2, d2dSets.size)
+        assertEquals(3, d2dSets.size)
         assertEquals(D2D_DEVICE_NAME, d2dSets[0].device)
         assertEquals(metadata.deviceName, d2dSets[0].name)
         assertEquals(metadata.token, d2dSets[0].token)

core/src/main/java/org/calyxos/seedvault/core/backends/Backend.kt

@@ -62,6 +62,10 @@ public interface Backend {
      */
     public val providerPackageName: String?
 
+    /**
+     * Returns [AppBackupFileType.Snapshot], [LegacyAppBackupFile.Metadata]
+     * and [FileBackupFileType.Snapshot].
+     */
     public suspend fun getAvailableBackupFileHandles(): List<FileHandle> {
         // v1 get all restore set tokens in root folder that have a metadata file
         // v2 get all snapshots in all repository folders
@@ -70,6 +74,7 @@ public interface Backend {
                 null,
                 AppBackupFileType.Snapshot::class,
                 LegacyAppBackupFile.Metadata::class,
+                FileBackupFileType.Snapshot::class,
             ) { fileInfo ->
                 add(fileInfo.fileHandle)
             }