From 3ef0d3e4a3b3cfb3a6e2be1cbd6f9fdeca3b339e Mon Sep 17 00:00:00 2001
From: Michelle Tang <mtang@signal.org>
Date: Fri, 27 Feb 2026 16:06:43 -0500
Subject: [PATCH] Skip pins of deleted messages.

---
 .../thoughtcrime/securesms/messages/SyncMessageProcessor.kt  | 5 +++++
 1 file changed, 5 insertions(+)

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 34718fef83..26d24d5591 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/SyncMessageProcessor.kt
@@ -1893,6 +1893,11 @@ object SyncMessageProcessor {
       return -1
     }
 
+    if (targetMessage.isRemoteDelete) {
+      warn(envelope.timestamp!!, "Cannot pin deleted message")
+      return -1
+    }
+
     val targetMessageId = (targetMessage as? MmsMessageRecord)?.latestRevisionId?.id ?: targetMessage.id
     val duration = if (pinMessage.pinDurationForever == true) MessageTable.PIN_FOREVER else pinMessage.pinDurationSeconds!!.toLong()
     val outgoingMessage = OutgoingMessage.pinMessage(