Do not allow invalid thread merge events in backups.

2025-12-23 20:48:43 +00:00 · 2025-03-31 09:34:10 -04:00
parent cffba71186
commit 42e7f5f4fc
1 changed files with 1 additions and 1 deletions
--- 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
@@ -291,7 +291,7 @@ class ChatItemArchiveExporter(
        }

        MessageTypes.isThreadMergeType(record.type) -> {
-          builder.updateMessage = record.toRemoteThreadMergeUpdate() ?: continue
+          builder.updateMessage = record.toRemoteThreadMergeUpdate()?.takeIf { exportState.recipientIdToAci.contains(builder.authorId) } ?: continue
          transformTimer.emit("thread-merge")
        }