From 5688d857895263c9da29b2e083cb43a3b541428d Mon Sep 17 00:00:00 2001 From: Greyson Parrelli Date: Thu, 10 Aug 2023 17:10:32 -0400 Subject: [PATCH] Do not send retry receipts for messages sent to our PNI. --- .../org/thoughtcrime/securesms/messages/MessageDecryptor.kt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt index c8d4cb45dd..2aff246c15 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt @@ -261,6 +261,11 @@ object MessageDecryptor { followUpOperations: MutableList, protocolException: ProtocolException ): Result { + if (ServiceId.parseOrNull(envelope.destinationServiceId) == SignalStore.account().pni) { + Log.w(TAG, "${logPrefix(envelope)} Decryption error for message sent to our PNI! Ignoring.") + return Result.Ignore(envelope, serverDeliveredTimestamp, followUpOperations) + } + val contentHint: ContentHint = ContentHint.fromType(protocolException.contentHint) val senderDevice: Int = protocolException.senderDevice val receivedTimestamp: Long = System.currentTimeMillis()