From cc3c75c870990582b20fbf66a6a2c0f6f3c57359 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 14 Jan 2025 15:27:04 -0500 Subject: [PATCH] Exclude invalid long messages from backups. --- .../securesms/backup/v2/exporters/ChatItemArchiveExporter.kt | 5 +++++ 1 file changed, 5 insertions(+) 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 9c04ca322b..a1b59f5e0a 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 @@ -296,6 +296,11 @@ class ChatItemArchiveExporter( } val attachments = extraData.attachmentsById[record.id] + if (attachments?.isNotEmpty() == true && attachments.all { it.contentType == MediaUtil.LONG_TEXT } && record.body.isNullOrEmpty()) { + Log.w(TAG, "Record with ID ${record.id} has long text attachments, but no body. Skipping.") + continue + } + val sticker = attachments?.firstOrNull { dbAttachment -> dbAttachment.isSticker } if (sticker?.stickerLocator != null) {