Rotate uploadEra when disabling Backups

Author: sashaweiss-signal

SignalServiceKit/Backups/Settings/BackupDisablingManager.swift

@@ -21,6 +21,7 @@ public final class BackupDisablingManager {
     private let authCredentialStore: AuthCredentialStore
     private let backupAttachmentCoordinator: BackupAttachmentCoordinator
     private let backupAttachmentDownloadQueueStatusManager: BackupAttachmentDownloadQueueStatusManager
+    private let backupAttachmentUploadEraStore: BackupAttachmentUploadEraStore
     private let backupCDNCredentialStore: BackupCDNCredentialStore
     private let backupKeyService: BackupKeyService
     private let backupPlanManager: BackupPlanManager
@@ -36,6 +37,7 @@ public final class BackupDisablingManager {
         authCredentialStore: AuthCredentialStore,
         backupAttachmentCoordinator: BackupAttachmentCoordinator,
         backupAttachmentDownloadQueueStatusManager: BackupAttachmentDownloadQueueStatusManager,
+        backupAttachmentUploadEraStore: BackupAttachmentUploadEraStore,
         backupCDNCredentialStore: BackupCDNCredentialStore,
         backupKeyService: BackupKeyService,
         backupPlanManager: BackupPlanManager,
@@ -47,6 +49,7 @@ public final class BackupDisablingManager {
         self.authCredentialStore = authCredentialStore
         self.backupAttachmentCoordinator = backupAttachmentCoordinator
         self.backupAttachmentDownloadQueueStatusManager = backupAttachmentDownloadQueueStatusManager
+        self.backupAttachmentUploadEraStore = backupAttachmentUploadEraStore
         self.backupCDNCredentialStore = backupCDNCredentialStore
         self.backupKeyService = backupKeyService
         self.backupPlanManager = backupPlanManager
@@ -222,6 +225,10 @@ public final class BackupDisablingManager {
                 authCredentialStore.removeAllBackupAuthCredentials(tx: tx)
                 backupCDNCredentialStore.wipe(tx: tx)
 
+                // If we reenable, we need to run another list-media to discover
+                // that we need to reupload all our media.
+                backupAttachmentUploadEraStore.rotateUploadEra(tx: tx)
+
                 if let aepBeingRotatedString = kvStore.getString(StoreKeys.aepBeingRotated, transaction: tx) {
                     logger.warn("Rotating AEP after disabling Backups!")
 

SignalServiceKit/Environment/AppSetup.swift

@@ -1064,6 +1064,7 @@ extension AppSetup.GlobalsContinuation {
             authCredentialStore: authCredentialStore,
             backupAttachmentCoordinator: backupAttachmentCoordinator,
             backupAttachmentDownloadQueueStatusManager: backupAttachmentDownloadQueueStatusManager,
+            backupAttachmentUploadEraStore: backupAttachmentUploadEraStore,
             backupCDNCredentialStore: backupCDNCredentialStore,
             backupKeyService: backupKeyService,
             backupPlanManager: backupPlanManager,

SignalServiceKit/Environment/RemoteConfigManager.swift

@@ -238,7 +238,7 @@ public class RemoteConfig {
         if BuildFlags.Backups.useLowerDefaultListMediaRefreshInterval {
             defaultValue = .dayInMs
         } else {
-            defaultValue = .dayInMs * 30
+            defaultValue = .dayInMs * 7
         }
         return getUInt64Value(forFlag: .backupListMediaDefaultRefreshIntervalMs, defaultValue: defaultValue)
     }

SignalServiceKit/tests/MessageBackup/BackupDisablingManagerTest.swift

@@ -14,6 +14,7 @@ struct BackupDisablingManagerTest {
         let mockAccountEntropyPoolManager = MockAccountEntropyPoolManager()
         let mockAuthCredentialStore = AuthCredentialStore(dateProvider: { Date() })
         let mockBackupAttachmentDownloadQueueStatusManager = MockBackupAttachmentDownloadQueueStatusManager()
+        let mockBackupAttachmentUploadEraStore = BackupAttachmentUploadEraStore()
         let mockBackupCDNCredentialStore = BackupCDNCredentialStore()
         let mockBackupKeyService = MockBackupKeyService()
         let mockBackupAttachmentCoordinator = MockBackupAttachmentCoordinator()
@@ -27,6 +28,7 @@ struct BackupDisablingManagerTest {
             authCredentialStore: mockAuthCredentialStore,
             backupAttachmentCoordinator: mockBackupAttachmentCoordinator,
             backupAttachmentDownloadQueueStatusManager: mockBackupAttachmentDownloadQueueStatusManager,
+            backupAttachmentUploadEraStore: mockBackupAttachmentUploadEraStore,
             backupCDNCredentialStore: mockBackupCDNCredentialStore,
             backupKeyService: mockBackupKeyService,
             backupPlanManager: mockBackupPlanManager,