From b0eed4a0952c6f412d9c7d30b9de4d2066d1ef57 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Tue, 3 Mar 2026 09:56:08 -0500 Subject: [PATCH] Filter out unmappable body ranges during archive export. --- .../backup/v2/exporters/ChatItemArchiveExporter.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 5fa60a272d..da368a5590 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 @@ -1393,16 +1393,16 @@ private fun ByteArray.toRemoteBodyRanges(dateSent: Long): List return emptyList() } - return decoded.ranges.map { range -> + return decoded.ranges.mapNotNull { range -> val mention = range.mentionUuid?.let { UuidUtil.parseOrNull(it) }?.toByteArray()?.toByteString()?.takeIf { it.isNotEmpty() } val style = if (mention == null) { - range.style?.toRemote() ?: BackupBodyRange.Style.NONE + range.style?.toRemote() } else { null } if (mention == null && style == null) { - return emptyList() + return@mapNotNull null } BackupBodyRange(