Dynamically compute MediaName and MediaId.

app/src/test/java/org/thoughtcrime/securesms/backup/v2/ArchivedMediaObjectIteratorTest.kt

@@ -4,8 +4,13 @@ import assertk.assertThat
 import assertk.assertions.hasSize
 import io.mockk.every
 import io.mockk.mockk
+import io.mockk.mockkObject
+import org.junit.Before
 import org.junit.Test
 import org.thoughtcrime.securesms.MockCursor
+import org.thoughtcrime.securesms.keyvalue.BackupValues
+import org.thoughtcrime.securesms.keyvalue.SignalStore
+import org.whispersystems.signalservice.api.backup.MediaRootBackupKey
 
 class ArchivedMediaObjectIteratorTest {
   private val cursor = mockk<MockCursor>(relaxed = true) {
@@ -17,6 +22,15 @@ class ArchivedMediaObjectIteratorTest {
     every { isAfterLast } answers { callOriginal() }
   }
 
+  @Before
+  fun setup() {
+    val mockBackupValues = mockk<BackupValues>()
+    every { mockBackupValues.mediaRootBackupKey } returns MediaRootBackupKey(ByteArray(32))
+
+    mockkObject(SignalStore)
+    every { SignalStore.backup } returns mockBackupValues
+  }
+
   @Test
   fun `Given a cursor with 0 items, when I convert to a list, then I expect a size of 0`() {
     runTest(0)
@@ -29,7 +43,7 @@ class ArchivedMediaObjectIteratorTest {
 
   private fun runTest(size: Int) {
     every { cursor.count } returns size
-    val iterator = ArchivedMediaObjectIterator(cursor)
+    val iterator = ArchiveMediaItemIterator(cursor)
 
     val list = iterator.asSequence().toList()
 

app/src/test/java/org/thoughtcrime/securesms/sms/UploadDependencyGraphTest.kt

@@ -227,7 +227,6 @@ class UploadDependencyGraphTest {
       mmsId = AttachmentTable.PREUPLOAD_MESSAGE_ID,
       hasData = false,
       hasThumbnail = false,
-      hasArchiveThumbnail = false,
       contentType = attachment.contentType,
       transferProgress = AttachmentTable.TRANSFER_PROGRESS_PENDING,
       size = attachment.size,
@@ -254,8 +253,6 @@ class UploadDependencyGraphTest {
       displayOrder = 0,
       uploadTimestamp = attachment.uploadTimestamp,
       dataHash = null,
-      archiveMediaId = null,
-      archiveMediaName = null,
       archiveCdn = 0,
       thumbnailRestoreState = AttachmentTable.ThumbnailRestoreState.NONE,
       archiveTransferState = AttachmentTable.ArchiveTransferState.NONE,