From 0edfb0bd681c1fc2ae43652274c65dd826807ebf Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Mon, 29 Nov 2021 11:21:40 -0400
Subject: [PATCH] Check whether recipient is blockable before allowing
 blocking.

---
 .../settings/conversation/ConversationSettingsViewModel.kt      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
index 48c807a27..47b0420ca 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/settings/conversation/ConversationSettingsViewModel.kt
@@ -138,7 +138,7 @@ sealed class ConversationSettingsViewModel(
             isSearchAvailable = true
           ),
           disappearingMessagesLifespan = recipient.expiresInSeconds,
-          canModifyBlockedState = !recipient.isSelf,
+          canModifyBlockedState = !recipient.isSelf && RecipientUtil.isBlockable(recipient),
           specificSettingsState = state.requireRecipientSettingsState().copy(
             contactLinkState = when {
               recipient.isSelf -> ContactLinkState.NONE