From 453795613e91acc37443bce62d94b2561c57f2e9 Mon Sep 17 00:00:00 2001
From: Sagar <sagar.0dev@gmail.com>
Date: Sat, 18 Jan 2025 00:32:25 +0530
Subject: [PATCH] Show message while Adding a Already Invited member

---
 .../groups/ui/addtogroup/AddToGroupViewModel.java  | 14 +++++++++-----
 app/src/main/res/values/strings.xml                |  1 +
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java
index 66b439c611..4cb8d5ad12 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/groups/ui/addtogroup/AddToGroupViewModel.java
@@ -8,6 +8,7 @@ import androidx.lifecycle.ViewModelProvider;
 
 import org.signal.core.util.concurrent.SignalExecutors;
 import org.thoughtcrime.securesms.R;
+import org.thoughtcrime.securesms.database.SignalDatabase;
 import org.thoughtcrime.securesms.dependencies.AppDependencies;
 import org.thoughtcrime.securesms.groups.ui.GroupChangeFailureReason;
 import org.thoughtcrime.securesms.groups.ui.GroupErrors;
@@ -43,12 +44,15 @@ public final class AddToGroupViewModel extends ViewModel {
       events.postValue(new Event.CloseEvent());
     } else if (groupRecipientIds.size() == 1) {
       SignalExecutors.BOUNDED.execute(() -> {
-        Recipient recipient      = Recipient.resolved(recipientId);
-        Recipient groupRecipient = Recipient.resolved(groupRecipientIds.get(0));
-        String    recipientName  = recipient.getDisplayName(context);
-        String    groupName      = groupRecipient.getDisplayName(context);
+        Recipient recipient        = Recipient.resolved(recipientId);
+        Recipient groupRecipient   = Recipient.resolved(groupRecipientIds.get(0));
+        String    recipientName    = recipient.getDisplayName(context);
+        String    groupName        = groupRecipient.getDisplayName(context);
+        boolean   isAlreadyInvited = SignalDatabase.groups().getGroup(groupRecipientIds.get(0)).get().isPendingMember(recipient);
 
-        if (groupRecipient.getGroupId().get().isV1() && !recipient.getHasE164()) {
+        if(isAlreadyInvited) {
+          events.postValue(new Event.ToastEvent(context.getResources().getString(R.string.AddToGroupActivity_s_has_already_been_invited_to_s, recipientName, groupName)));
+        } else if (groupRecipient.getGroupId().get().isV1() && !recipient.getHasE164()) {
           events.postValue(new Event.LegacyGroupDenialEvent());
         } else {
           events.postValue(new Event.AddToSingleGroupConfirmationEvent(context.getResources().getString(R.string.AddToGroupActivity_add_member),
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 51a36d9fe1..28f6b3624b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1112,6 +1112,7 @@
     <string name="AddToGroupActivity_add_to_group">Add to group</string>
     <string name="AddToGroupActivity_add_to_groups">Add to groups</string>
     <string name="AddToGroupActivity_this_person_cant_be_added_to_legacy_groups">This person can\'t be added to legacy groups.</string>
+    <string name="AddToGroupActivity_s_has_already_been_invited_to_s">\"%1$s\" has already been invited to \"%2$s\".</string>
     <string name="AddToGroupActivity_add">Add</string>
     <string name="AddToGroupActivity_add_to_a_group">Add to a group</string>