Add archived media sync job.

app/src/main/java/org/thoughtcrime/securesms/backup/v2/BackupRepository.kt

@@ -224,6 +224,22 @@ object BackupRepository {
     Log.d(TAG, "import() ${eventTimer.stop().summary}")
   }
 
+  fun listRemoteMediaObjects(limit: Int, cursor: String? = null): NetworkResult<ArchiveGetMediaItemsResponse> {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    return api
+      .triggerBackupIdReservation(backupKey)
+      .then { getAuthCredential() }
+      .then { credential ->
+        api.setPublicKey(backupKey, credential)
+          .map { credential }
+      }
+      .then { credential ->
+        api.getArchiveMediaItemsPage(backupKey, credential, limit, cursor)
+      }
+  }
+
   /**
    * Returns an object with details about the remote backup state.
    */
@@ -420,6 +436,34 @@ object BackupRepository {
       .also { Log.i(TAG, "deleteArchivedMediaResult: $it") }
   }
 
+  fun deleteAbandonedMediaObjects(mediaObjects: Collection<ArchivedMediaObject>): NetworkResult<Unit> {
+    val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
+    val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
+
+    val mediaToDelete = mediaObjects
+      .map {
+        DeleteArchivedMediaRequest.ArchivedMediaObject(
+          cdn = it.cdn,
+          mediaId = it.mediaId
+        )
+      }
+
+    if (mediaToDelete.isEmpty()) {
+      Log.i(TAG, "No media to delete, quick success")
+      return NetworkResult.Success(Unit)
+    }
+
+    return getAuthCredential()
+      .then { credential ->
+        api.deleteArchivedMedia(
+          backupKey = backupKey,
+          serviceCredential = credential,
+          mediaToDelete = mediaToDelete
+        )
+      }
+      .also { Log.i(TAG, "deleteAbandonedMediaObjectsResult: $it") }
+  }
+
   fun debugDeleteAllArchivedMedia(): NetworkResult<Unit> {
     val api = ApplicationDependencies.getSignalServiceAccountManager().archiveApi
     val backupKey = SignalStore.svr().getOrCreateMasterKey().deriveBackupKey()
@@ -566,6 +610,8 @@ object BackupRepository {
   }
 }
 
+data class ArchivedMediaObject(val mediaId: String, val cdn: Int)
+
 data class BackupDirectories(val backupDir: String, val mediaDir: String)
 
 class ExportState(val backupTime: Long, val allowMediaBackup: Boolean) {

app/src/main/java/org/thoughtcrime/securesms/backup/v2/ui/MessageBackupsTestRestoreViewModel.kt

@@ -15,14 +15,15 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.kotlin.plusAssign
 import io.reactivex.rxjava3.kotlin.subscribeBy
 import io.reactivex.rxjava3.schedulers.Schedulers
-import org.signal.core.util.orNull
 import org.signal.libsignal.zkgroup.profiles.ProfileKey
 import org.thoughtcrime.securesms.backup.v2.BackupRepository
 import org.thoughtcrime.securesms.dependencies.ApplicationDependencies
-import org.thoughtcrime.securesms.jobmanager.JobTracker
 import org.thoughtcrime.securesms.jobs.BackupRestoreJob
+import org.thoughtcrime.securesms.jobs.BackupRestoreMediaJob
+import org.thoughtcrime.securesms.jobs.SyncArchivedMediaJob
 import org.thoughtcrime.securesms.recipients.Recipient
 import java.io.InputStream
+import kotlin.time.Duration.Companion.seconds
 
 class MessageBackupsTestRestoreViewModel : ViewModel() {
   val disposables = CompositeDisposable()
@@ -47,8 +48,12 @@ class MessageBackupsTestRestoreViewModel : ViewModel() {
   fun restore() {
     _state.value = _state.value.copy(importState = ImportState.IN_PROGRESS)
     disposables += Single.fromCallable {
-      val jobState = ApplicationDependencies.getJobManager().runSynchronously(BackupRestoreJob(), 120_000)
-      jobState.orNull() == JobTracker.JobState.SUCCESS
+      ApplicationDependencies
+        .getJobManager()
+        .startChain(BackupRestoreJob())
+        .then(SyncArchivedMediaJob())
+        .then(BackupRestoreMediaJob())
+        .enqueueAndBlockUntilCompletion(120.seconds.inWholeMilliseconds)
     }
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())