From 08915befa50e07d2c90846e73e53c7684bbab5b5 Mon Sep 17 00:00:00 2001 From: Michelle Tang Date: Fri, 19 Dec 2025 16:54:34 -0500 Subject: [PATCH] Fix sync message author when pinning. --- .../securesms/messages/SyncMessageProcessor.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt index 5ee6000e03..c3429485f7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt @@ -1886,7 +1886,14 @@ object SyncMessageProcessor { } val pinMessage = message.pinMessage!! - val targetMessage = SignalDatabase.messages.getMessageFor(pinMessage.targetSentTimestamp!!, Recipient.self().id) + val targetAuthorServiceId: ServiceId = ACI.parseOrThrow(pinMessage.targetAuthorAciBinary!!) + if (targetAuthorServiceId.isUnknown) { + warn(envelope.timestamp!!, "Unknown author") + return -1 + } + + val targetAuthor = Recipient.externalPush(targetAuthorServiceId) + val targetMessage = SignalDatabase.messages.getMessageFor(pinMessage.targetSentTimestamp!!, targetAuthor.id) if (targetMessage == null) { warn(envelope.timestamp!!, "Unable to find target message for sync message. Putting in early message cache.") if (earlyMessageCacheEntry != null) {