Fix retries: don't upload metadata three times

seedvault-app · Sep 5, 2024 · 17d0885 · 17d0885
1 parent 5418a8e
commit 17d0885
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/app/src/main/java/com/stevesoltys/seedvault/worker/ApkBackupManager.kt b/app/src/main/java/com/stevesoltys/seedvault/worker/ApkBackupManager.kt
@@ -135,6 +135,7 @@ internal class ApkBackupManager(
         for (i in 1..n) {
             try {
                 block()
+                return
             } catch (e: Exception) {
                 if (i == n) throw e
                 Log.e(TAG, "Error (#$i), we'll keep trying", e)

diff --git a/app/src/test/java/com/stevesoltys/seedvault/worker/ApkBackupManagerTest.kt b/app/src/test/java/com/stevesoltys/seedvault/worker/ApkBackupManagerTest.kt
@@ -234,6 +234,10 @@ internal class ApkBackupManagerTest : TransportTest() {
             apkBackup.backupApkIfNecessary(notAllowedPackages[1], any())
             metadataOutputStream.close()
         }
+        // metadata should only get uploaded once
+        verify(exactly = 1) {
+            metadataManager.uploadMetadata(metadataOutputStream)
+        }
     }
 
     @Test