Dynamically compute MediaName and MediaId.

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

@@ -29,19 +29,12 @@ class DatabaseAttachment : Attachment {
   @JvmField
   val archiveCdn: Int
 
-  @JvmField
-  val archiveMediaName: String?
-
-  @JvmField
-  val archiveMediaId: String?
-
   @JvmField
   val thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState
 
   @JvmField
   val archiveTransferState: AttachmentTable.ArchiveTransferState
 
-  private val hasArchiveThumbnail: Boolean
   private val hasThumbnail: Boolean
   val displayOrder: Int
 
@@ -50,7 +43,6 @@ class DatabaseAttachment : Attachment {
     mmsId: Long,
     hasData: Boolean,
     hasThumbnail: Boolean,
-    hasArchiveThumbnail: Boolean,
     contentType: String?,
     transferProgress: Int,
     size: Long,
@@ -78,8 +70,6 @@ class DatabaseAttachment : Attachment {
     uploadTimestamp: Long,
     dataHash: String?,
     archiveCdn: Int,
-    archiveMediaName: String?,
-    archiveMediaId: String?,
     thumbnailRestoreState: AttachmentTable.ThumbnailRestoreState,
     archiveTransferState: AttachmentTable.ArchiveTransferState,
     uuid: UUID?
@@ -114,11 +104,8 @@ class DatabaseAttachment : Attachment {
     this.hasData = hasData
     this.dataHash = dataHash
     this.hasThumbnail = hasThumbnail
-    this.hasArchiveThumbnail = hasArchiveThumbnail
     this.displayOrder = displayOrder
     this.archiveCdn = archiveCdn
-    this.archiveMediaName = archiveMediaName
-    this.archiveMediaId = archiveMediaId
     this.thumbnailRestoreState = thumbnailRestoreState
     this.archiveTransferState = archiveTransferState
   }
@@ -131,9 +118,6 @@ class DatabaseAttachment : Attachment {
     mmsId = parcel.readLong()
     displayOrder = parcel.readInt()
     archiveCdn = parcel.readInt()
-    archiveMediaName = parcel.readString()
-    archiveMediaId = parcel.readString()
-    hasArchiveThumbnail = ParcelUtil.readBoolean(parcel)
     thumbnailRestoreState = AttachmentTable.ThumbnailRestoreState.deserialize(parcel.readInt())
     archiveTransferState = AttachmentTable.ArchiveTransferState.deserialize(parcel.readInt())
   }
@@ -147,9 +131,6 @@ class DatabaseAttachment : Attachment {
     dest.writeLong(mmsId)
     dest.writeInt(displayOrder)
     dest.writeInt(archiveCdn)
-    dest.writeString(archiveMediaName)
-    dest.writeString(archiveMediaId)
-    ParcelUtil.writeBoolean(dest, hasArchiveThumbnail)
     dest.writeInt(thumbnailRestoreState.value)
     dest.writeInt(archiveTransferState.value)
   }
@@ -169,7 +150,7 @@ class DatabaseAttachment : Attachment {
     }
 
   override val thumbnailUri: Uri?
-    get() = if (hasArchiveThumbnail) {
+    get() = if (thumbnailRestoreState == AttachmentTable.ThumbnailRestoreState.FINISHED) {
       PartAuthority.getAttachmentThumbnailUri(attachmentId)
     } else {
       null