Refactor and cleanup backupv2 media restore.

app/src/main/java/org/thoughtcrime/securesms/attachments/DatabaseAttachment.kt

@@ -29,9 +29,6 @@ class DatabaseAttachment : Attachment {
   @JvmField
   val archiveCdn: Int
 
-  @JvmField
-  val archiveThumbnailCdn: Int
-
   @JvmField
   val archiveMediaName: String?
 
@@ -78,7 +75,6 @@ class DatabaseAttachment : Attachment {
     uploadTimestamp: Long,
     dataHash: String?,
     archiveCdn: Int,
-    archiveThumbnailCdn: Int,
     archiveMediaName: String?,
     archiveMediaId: String?,
     thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState,
@@ -117,7 +113,6 @@ class DatabaseAttachment : Attachment {
     this.hasArchiveThumbnail = hasArchiveThumbnail
     this.displayOrder = displayOrder
     this.archiveCdn = archiveCdn
-    this.archiveThumbnailCdn = archiveThumbnailCdn
     this.archiveMediaName = archiveMediaName
     this.archiveMediaId = archiveMediaId
     this.thumbnailRestoreState = thumbnailRestoreState
@@ -131,7 +126,6 @@ class DatabaseAttachment : Attachment {
     mmsId = parcel.readLong()
     displayOrder = parcel.readInt()
     archiveCdn = parcel.readInt()
-    archiveThumbnailCdn = parcel.readInt()
     archiveMediaName = parcel.readString()
     archiveMediaId = parcel.readString()
     hasArchiveThumbnail = ParcelUtil.readBoolean(parcel)
@@ -147,7 +141,6 @@ class DatabaseAttachment : Attachment {
     dest.writeLong(mmsId)
     dest.writeInt(displayOrder)
     dest.writeInt(archiveCdn)
-    dest.writeInt(archiveThumbnailCdn)
     dest.writeString(archiveMediaName)
     dest.writeString(archiveMediaId)
     ParcelUtil.writeBoolean(dest, hasArchiveThumbnail)

app/src/main/java/org/thoughtcrime/securesms/attachments/InvalidAttachmentException.kt

@@ -0,0 +1,14 @@
+/*
+ * Copyright 2024 Signal Messenger, LLC
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+package org.thoughtcrime.securesms.attachments
+
+/**
+ * Thrown by jobs unable to rehydrate enough attachment information to download it.
+ */
+class InvalidAttachmentException : Exception {
+  constructor(s: String?) : super(s)
+  constructor(e: Exception?) : super(e)
+}