From f61ea6d486202eb6ed2b34c31d975f1bf1f80584 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 9 Dec 2024 23:48:20 -0500
Subject: [PATCH] Fix export issue with bad edit messages from during
 development.

---
 .../backup/v2/exporters/ChatItemArchiveExporter.kt          | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
index 4ffd3f9162..49f2d77dd8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/exporters/ChatItemArchiveExporter.kt
@@ -300,7 +300,11 @@ class ChatItemArchiveExporter(
       if (record.latestRevisionId == null) {
         val previousEdits = revisionMap.remove(record.id)
         if (previousEdits != null) {
-          builder.revisions = previousEdits
+          if (builder.standardMessage != null) {
+            builder.revisions = previousEdits
+          } else {
+            Log.w(TAG, "[${record.dateSent}] Attempted to set revisions on a non-standard message! Ignoring.")
+          }
         }
         buffer += builder.build()
       } else {