Ensure story media is only uploaded once.

app/src/test/java/org/thoughtcrime/securesms/testutil/OutgoingMediaMessageBuilder.kt

@@ -0,0 +1,62 @@
+package org.thoughtcrime.securesms.testutil
+
+import org.thoughtcrime.securesms.attachments.Attachment
+import org.thoughtcrime.securesms.contactshare.Contact
+import org.thoughtcrime.securesms.database.ThreadDatabase
+import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch
+import org.thoughtcrime.securesms.database.documents.NetworkFailure
+import org.thoughtcrime.securesms.database.model.Mention
+import org.thoughtcrime.securesms.database.model.ParentStoryId
+import org.thoughtcrime.securesms.database.model.StoryType
+import org.thoughtcrime.securesms.database.model.databaseprotos.GiftBadge
+import org.thoughtcrime.securesms.linkpreview.LinkPreview
+import org.thoughtcrime.securesms.mms.OutgoingMediaMessage
+import org.thoughtcrime.securesms.mms.OutgoingSecureMediaMessage
+import org.thoughtcrime.securesms.mms.QuoteModel
+import org.thoughtcrime.securesms.recipients.Recipient
+
+object OutgoingMediaMessageBuilder {
+  fun create(
+    recipient: Recipient = Recipient.UNKNOWN,
+    message: String = "",
+    attachments: List<Attachment> = emptyList(),
+    sentTimeMillis: Long = System.currentTimeMillis(),
+    subscriptionId: Int = -1,
+    expiresIn: Long = -1,
+    viewOnce: Boolean = false,
+    distributionType: Int = ThreadDatabase.DistributionTypes.DEFAULT,
+    storyType: StoryType = StoryType.NONE,
+    parentStoryId: ParentStoryId? = null,
+    isStoryReaction: Boolean = false,
+    quoteModel: QuoteModel? = null,
+    contacts: List<Contact> = emptyList(),
+    linkPreviews: List<LinkPreview> = emptyList(),
+    mentions: List<Mention> = emptyList(),
+    networkFailures: Set<NetworkFailure> = emptySet(),
+    identityKeyMismatches: Set<IdentityKeyMismatch> = emptySet(),
+    giftBadge: GiftBadge? = null
+  ): OutgoingMediaMessage {
+    return OutgoingMediaMessage(
+      recipient,
+      message,
+      attachments,
+      sentTimeMillis,
+      subscriptionId,
+      expiresIn,
+      viewOnce,
+      distributionType,
+      storyType,
+      parentStoryId,
+      isStoryReaction,
+      quoteModel,
+      contacts,
+      linkPreviews,
+      mentions,
+      networkFailures,
+      identityKeyMismatches,
+      giftBadge
+    )
+  }
+
+  fun OutgoingMediaMessage.secure(): OutgoingSecureMediaMessage = OutgoingSecureMediaMessage(this)
+}

app/src/test/java/org/thoughtcrime/securesms/testutil/UriAttachmentBuilder.kt

@@ -0,0 +1,45 @@
+package org.thoughtcrime.securesms.testutil
+
+import android.net.Uri
+import org.thoughtcrime.securesms.attachments.UriAttachment
+import org.thoughtcrime.securesms.audio.AudioHash
+import org.thoughtcrime.securesms.blurhash.BlurHash
+import org.thoughtcrime.securesms.database.AttachmentDatabase
+import org.thoughtcrime.securesms.stickers.StickerLocator
+
+object UriAttachmentBuilder {
+  fun build(
+    id: Long,
+    uri: Uri = Uri.parse("content://$id"),
+    contentType: String,
+    transferState: Int = AttachmentDatabase.TRANSFER_PROGRESS_PENDING,
+    size: Long = 0L,
+    fileName: String = "file$id",
+    voiceNote: Boolean = false,
+    borderless: Boolean = false,
+    videoGif: Boolean = false,
+    quote: Boolean = false,
+    caption: String? = null,
+    stickerLocator: StickerLocator? = null,
+    blurHash: BlurHash? = null,
+    audioHash: AudioHash? = null,
+    transformProperties: AttachmentDatabase.TransformProperties? = null
+  ): UriAttachment {
+    return UriAttachment(
+      uri,
+      contentType,
+      transferState,
+      size,
+      fileName,
+      voiceNote,
+      borderless,
+      videoGif,
+      quote,
+      caption,
+      stickerLocator,
+      blurHash,
+      audioHash,
+      transformProperties
+    )
+  }
+}