From 03c264fb67c05065ad08f3b0cff3fd45e9ed55de Mon Sep 17 00:00:00 2001
From: 0x330a <92654767+0x330a@users.noreply.github.com>
Date: Thu, 27 Apr 2023 13:19:07 +1000
Subject: [PATCH] fix: add blocked check for read receipt and updating expiring
 messages

---
 .../securesms/conversation/v2/menus/ConversationMenuHelper.kt   | 2 +-
 .../java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index a772d13312..3de2669503 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -64,7 +64,7 @@ object ConversationMenuHelper {
         // Base menu (options that should always be present)
         inflater.inflate(R.menu.menu_conversation, menu)
         // Expiring messages
-        if (!isOpenGroup && (thread.hasApprovedMe() || thread.isClosedGroupRecipient)) {
+        if (!isOpenGroup && (thread.hasApprovedMe() || thread.isClosedGroupRecipient) && !thread.isBlocked) {
             if (thread.expireMessages > 0) {
                 inflater.inflate(R.menu.menu_conversation_expiration_on, menu)
                 val item = menu.findItem(R.id.menu_expiring_messages)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
index d488ff5a09..c10e1b635d 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/SessionMetaProtocol.kt
@@ -49,7 +49,7 @@ object SessionMetaProtocol {
 
     @JvmStatic
     fun shouldSendReadReceipt(recipient: Recipient): Boolean {
-        return !recipient.isGroupRecipient && recipient.isApproved
+        return !recipient.isGroupRecipient && recipient.isApproved && !recipient.isBlocked
     }
 
     @JvmStatic