Prevent sending to groups that the user has quit

[signal-cli] / src / main / java / org / asamk / signal / Manager.java

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index 68f664554ced9ac4e4e1a772c87c26edf4cb5887..987a5cacd4b147f38bdf474225a66c4496fb196c 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -515,6 +515,19 @@ class Manager implements Signal {
         return Optional.of(createAttachment(file));
     }
 
         return Optional.of(createAttachment(file));
     }
 

+    private GroupInfo getGroupForSending(byte[] groupId) throws GroupNotFoundException, NotAGroupMemberException {
+        GroupInfo g = groupStore.getGroup(groupId);
+        if (g == null) {
+            throw new GroupNotFoundException(groupId);
+        }
+        for (String member : g.members) {
+            if (member.equals(this.username)) {
+                return g;
+            }
+        }
+        throw new NotAGroupMemberException(groupId, g.name);
+    }
+

     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)
     @Override
     public void sendGroupMessage(String messageText, List<String> attachments,
                                  byte[] groupId)


@@ -531,10 +544,7 @@ class Manager implements Signal {
         }
         SignalServiceDataMessage message = messageBuilder.build();
 
         }
         SignalServiceDataMessage message = messageBuilder.build();
 

-        GroupInfo g = groupStore.getGroup(groupId);
-        if (g == null) {
-            throw new GroupNotFoundException(groupId);
-        }
+        final GroupInfo g = getGroupForSending(groupId);

 
         // Don't send group message to ourself
         final List<String> membersSend = new ArrayList<>(g.members);
 
         // Don't send group message to ourself
         final List<String> membersSend = new ArrayList<>(g.members);


@@ -551,10 +561,7 @@ class Manager implements Signal {
                 .asGroupMessage(group)
                 .build();
 
                 .asGroupMessage(group)
                 .build();
 

-        final GroupInfo g = groupStore.getGroup(groupId);
-        if (g == null) {
-            throw new GroupNotFoundException(groupId);
-        }
+        final GroupInfo g = getGroupForSending(groupId);

         g.members.remove(this.username);
         groupStore.updateGroup(g);
 
         g.members.remove(this.username);
         groupStore.updateGroup(g);
 


@@ -568,10 +575,7 @@ class Manager implements Signal {
             g = new GroupInfo(Util.getSecretBytes(16));
             g.members.add(username);
         } else {
             g = new GroupInfo(Util.getSecretBytes(16));
             g.members.add(username);
         } else {

-            g = groupStore.getGroup(groupId);
-            if (g == null) {
-                throw new GroupNotFoundException(groupId);
-            }
+            g = getGroupForSending(groupId);

         }
 
         if (name != null) {
         }
 
         if (name != null) {