From 6a6b56e50c78024d2083f6ce6e6189014ed682a6 Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Wed, 5 Nov 2025 10:31:59 -0500 Subject: [PATCH] Fix validation check around thread merge events. --- .../securesms/backup/v2/exporters/ChatItemArchiveExporter.kt | 2 +- 1 file changed, 1 insertion(+), 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 2b04d3adf0..1d740517b2 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 @@ -312,7 +312,7 @@ class ChatItemArchiveExporter( } MessageTypes.isThreadMergeType(record.type) -> { - builder.updateMessage = record.toRemoteThreadMergeUpdate(record.dateSent)?.takeIf { exportState.recipientIdToAci.contains(builder.authorId) } ?: continue + builder.updateMessage = record.toRemoteThreadMergeUpdate(record.dateSent)?.takeIf { exportState.recipientIdToAci[builder.authorId] != null } ?: continue transformTimer.emit("thread-merge") }