From f3a9f7f91dd22409b80dbce9e20f39a501f1f14c Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Sat, 21 Sep 2024 09:59:09 -0400
Subject: [PATCH] Fix handling of stickers with invalid locators in backups.

---
 .../thoughtcrime/securesms/attachments/TombstoneAttachment.kt | 4 +++-
 .../securesms/backup/v2/util/ArchiveConverterExtensions.kt    | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
index 11fe754ada..a784561846 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/attachments/TombstoneAttachment.kt
@@ -4,6 +4,7 @@ import android.net.Uri
 import android.os.Parcel
 import org.thoughtcrime.securesms.blurhash.BlurHash
 import org.thoughtcrime.securesms.database.AttachmentTable
+import org.thoughtcrime.securesms.stickers.StickerLocator
 import java.util.UUID
 
 /**
@@ -53,6 +54,7 @@ class TombstoneAttachment : Attachment {
     voiceNote: Boolean = false,
     borderless: Boolean = false,
     gif: Boolean = false,
+    stickerLocator: StickerLocator? = null,
     quote: Boolean,
     uuid: UUID?
   ) : super(
@@ -76,7 +78,7 @@ class TombstoneAttachment : Attachment {
     incrementalMacChunkSize = incrementalMacChunkSize ?: 0,
     uploadTimestamp = 0,
     caption = caption,
-    stickerLocator = null,
+    stickerLocator = stickerLocator,
     blurHash = BlurHash.parseOrNull(blurHash),
     audioHash = null,
     transformProperties = null,
diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt
index ea23c9429e..e6e4b243a8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/util/ArchiveConverterExtensions.kt
@@ -83,6 +83,7 @@ fun FilePointer?.toLocalAttachment(
       borderless = borderless,
       gif = gif,
       quote = false,
+      stickerLocator = stickerLocator,
       uuid = UuidUtil.fromByteStringOrNull(uuid)
     )
   } else if (this.backupLocator != null) {