From eecb18b4368394a591a532f07ad57e771afe9db2 Mon Sep 17 00:00:00 2001
From: Sagar <85388413+Sagar0-0@users.noreply.github.com>
Date: Tue, 15 Apr 2025 20:10:32 +0530
Subject: [PATCH] Add correct dialog message while blocking group.

---
 .../blocked/BlockedUsersActivity.java         | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java b/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
index 50a8205262..74d691cb43 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/blocked/BlockedUsersActivity.java
@@ -21,6 +21,7 @@ import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.components.ContactFilterView;
 import org.thoughtcrime.securesms.contacts.ContactSelectionDisplayMode;
 import org.thoughtcrime.securesms.contacts.paged.ChatType;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.recipients.Recipient;
 import org.thoughtcrime.securesms.recipients.RecipientId;
 import org.thoughtcrime.securesms.util.DynamicNoActionBarTheme;
@@ -118,9 +119,23 @@ public class BlockedUsersActivity extends PassphraseRequiredActivity implements
       return;
     }
 
-    AlertDialog confirmationDialog = new MaterialAlertDialogBuilder(this)
-        .setTitle(R.string.BlockedUsersActivity__block_user)
-        .setMessage(getString(R.string.BlockedUserActivity__s_will_not_be_able_to, displayName))
+    MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this);
+
+    if (resolvedRecipient.isPresent() && resolvedRecipient.get().isGroup()) {
+      Recipient recipient = resolvedRecipient.get();
+      if (SignalDatabase.groups().isActive(recipient.requireGroupId())) {
+        builder.setTitle(getString(R.string.BlockUnblockDialog_block_and_leave_s, displayName));
+        builder.setMessage(R.string.BlockUnblockDialog_you_will_no_longer_receive_messages_or_updates);
+      } else {
+        builder.setTitle(getString(R.string.BlockUnblockDialog_block_s, displayName));
+        builder.setMessage(R.string.BlockUnblockDialog_group_members_wont_be_able_to_add_you);
+      }
+    } else {
+      builder.setTitle(R.string.BlockedUsersActivity__block_user);
+      builder.setMessage(getString(R.string.BlockedUserActivity__s_will_not_be_able_to, displayName));
+    }
+
+    AlertDialog confirmationDialog = builder
         .setPositiveButton(R.string.BlockedUsersActivity__block, (dialog, which) -> {
           if (recipientId.isPresent()) {
             viewModel.block(recipientId.get());