From 6108b5ab7765a75e2c79756dbd39e5d621034463 Mon Sep 17 00:00:00 2001
From: Greyson Parrelli <greyson@signal.org>
Date: Mon, 8 Sep 2025 16:18:11 -0400
Subject: [PATCH] Another attempt to fix validation errors around invalid long
 text attachments.

---
 .../thoughtcrime/securesms/backup/v2/ArchiveErrorCases.kt  | 2 +-
 .../backup/v2/exporters/ChatItemArchiveExporter.kt         | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveErrorCases.kt b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveErrorCases.kt
index ddc0f7bdb3..3445a04dfe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveErrorCases.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/backup/v2/ArchiveErrorCases.kt
@@ -175,7 +175,7 @@ object ExportOddities {
   }
 
   fun unreadableLongTextAttachment(sentTimestamp: Long): String {
-    return log(sentTimestamp, "Long text attachment was unreadable. Falling back to the known body with an attachment pointer.")
+    return log(sentTimestamp, "Long text attachment was unreadable. Dropping the pointer.")
   }
 
   fun unopenableLongTextAttachment(sentTimestamp: Long): String {
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 9c92eed3a8..abd5f6793c 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
@@ -1041,7 +1041,9 @@ private fun BackupMessageRecord.getBodyText(attachments: List<DatabaseAttachment
   }
 
   if (longTextAttachment.uri == null || longTextAttachment.transferState != AttachmentTable.TRANSFER_PROGRESS_DONE) {
-    return StringUtil.trimToFit(this.body.emptyIfNull(), MAX_INLINED_BODY_SIZE_WITH_LONG_ATTACHMENT_POINTER) to longTextAttachment
+    Log.w(TAG, ExportOddities.undownloadedLongTextAttachment(this.dateSent))
+    val body = StringUtil.trimToFit(this.body.emptyIfNull(), MAX_INLINED_BODY_SIZE_WITH_LONG_ATTACHMENT_POINTER)
+    return body to longTextAttachment.takeUnless { body.isBlank() }
   }
 
   val longText = try {
@@ -1053,7 +1055,8 @@ private fun BackupMessageRecord.getBodyText(attachments: List<DatabaseAttachment
 
   if (longText == null) {
     Log.w(TAG, ExportOddities.unopenableLongTextAttachment(this.dateSent))
-    return StringUtil.trimToFit(this.body.emptyIfNull(), MAX_INLINED_BODY_SIZE_WITH_LONG_ATTACHMENT_POINTER) to longTextAttachment
+    val body = StringUtil.trimToFit(this.body.emptyIfNull(), MAX_INLINED_BODY_SIZE_WITH_LONG_ATTACHMENT_POINTER)
+    return body to longTextAttachment.takeUnless { body.isBlank() }
   }
 
   val trimmed = StringUtil.trimToFit(longText, MAX_INLINED_BODY_SIZE)