Improve internal group handling for receiving

diff --git a/src/main/java/org/asamk/signal/JsonGroupStore.java b/src/main/java/org/asamk/signal/JsonGroupStore.java
index 29dc00317ba1d40f59394b10c4875eb5df807444..7bcf22c24a5c7c1d4567e960684ba8ab4288be8e 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonGroupStore.java
+++ b/src/main/java/org/asamk/signal/JsonGroupStore.java
@@ -25,11 +25,8 @@ public class JsonGroupStore {
         groups.put(Base64.encodeBytes(group.groupId), group);
     }
 
         groups.put(Base64.encodeBytes(group.groupId), group);
     }
 

-    GroupInfo getGroup(byte[] groupId) throws GroupNotFoundException {
+    GroupInfo getGroup(byte[] groupId) {

         GroupInfo g = groups.get(Base64.encodeBytes(groupId));
         GroupInfo g = groups.get(Base64.encodeBytes(groupId));

-        if (g == null) {
-            throw new GroupNotFoundException(groupId);
-        }

         return g;
     }
 
         return g;
     }
 

diff --git a/src/main/java/org/asamk/signal/Main.java b/src/main/java/org/asamk/signal/Main.java
index 5f716e3cb52083b2a6b068437879b1919f084b25..5e6bfadb6d5ecfd0aeb93b762a44b6f3853b9b3f 100644 (file)
--- a/src/main/java/org/asamk/signal/Main.java
+++ b/src/main/java/org/asamk/signal/Main.java
@@ -665,7 +665,7 @@ public class Main {
         }
 
         @Override
         }
 
         @Override

-        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
+        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {

             SignalServiceAddress source = envelope.getSourceAddress();
             ContactInfo sourceContact = m.getContact(source.getNumber());
             System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));
             SignalServiceAddress source = envelope.getSourceAddress();
             ContactInfo sourceContact = m.getContact(source.getNumber());
             System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber(), envelope.getSourceDevice()));


@@ -682,7 +682,7 @@ public class Main {
                 } else {
                     if (content.getDataMessage().isPresent()) {
                         SignalServiceDataMessage message = content.getDataMessage().get();
                 } else {
                     if (content.getDataMessage().isPresent()) {
                         SignalServiceDataMessage message = content.getDataMessage().get();

-                        handleSignalServiceDataMessage(message, group);
+                        handleSignalServiceDataMessage(message);

                     }
                     if (content.getSyncMessage().isPresent()) {
                         System.out.println("Received a sync message");
                     }
                     if (content.getSyncMessage().isPresent()) {
                         System.out.println("Received a sync message");


@@ -725,7 +725,7 @@ public class Main {
                             }
                             System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
                             SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
                             }
                             System.out.println("To: " + to + " , Message timestamp: " + sentTranscriptMessage.getTimestamp());
                             SignalServiceDataMessage message = sentTranscriptMessage.getMessage();

-                            handleSignalServiceDataMessage(message, null);
+                            handleSignalServiceDataMessage(message);

                         }
                     }
                 }
                         }
                     }
                 }


@@ -735,8 +735,7 @@ public class Main {
             System.out.println();
         }
 
             System.out.println();
         }
 

-        // TODO remove group parameter
-        private void handleSignalServiceDataMessage(SignalServiceDataMessage message, GroupInfo group) {
+        private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {

             System.out.println("Message timestamp: " + message.getTimestamp());
 
             if (message.getBody().isPresent()) {
             System.out.println("Message timestamp: " + message.getTimestamp());
 
             if (message.getBody().isPresent()) {


@@ -748,10 +747,13 @@ public class Main {
                 System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
                 if (groupInfo.getName().isPresent()) {
                     System.out.println("  Name: " + groupInfo.getName().get());
                 System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
                 if (groupInfo.getName().isPresent()) {
                     System.out.println("  Name: " + groupInfo.getName().get());

-                } else if (group != null) {
-                    System.out.println("  Name: " + group.name);

                 } else {
                 } else {

-                    System.out.println("  Name: <Unknown group>");
+                    GroupInfo group = m.getGroup(groupInfo.getGroupId());
+                    if (group != null) {
+                        System.out.println("  Name: " + group.name);
+                    } else {
+                        System.out.println("  Name: <Unknown group>");
+                    }

                 }
                 System.out.println("  Type: " + groupInfo.getType());
                 if (groupInfo.getMembers().isPresent()) {
                 }
                 System.out.println("  Type: " + groupInfo.getType());
                 if (groupInfo.getMembers().isPresent()) {


@@ -799,8 +801,8 @@ public class Main {
         }
 
         @Override
         }
 
         @Override

-        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, GroupInfo group) {
-            super.handleMessage(envelope, content, group);
+        public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content) {
+            super.handleMessage(envelope, content);

 
             if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();
 
             if (!envelope.isReceipt() && content != null && content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();

diff --git a/src/main/java/org/asamk/signal/Manager.java b/src/main/java/org/asamk/signal/Manager.java
index bd8d8a5f8446f6364d5a8afe018993179bf2a72d..1b460a77890a8259f0a02ad70cc20454a3822b78 100644 (file)
--- a/src/main/java/org/asamk/signal/Manager.java
+++ b/src/main/java/org/asamk/signal/Manager.java
@@ -435,7 +435,11 @@ class Manager implements Signal {
         }
         SignalServiceDataMessage message = messageBuilder.build();
 
         }
         SignalServiceDataMessage message = messageBuilder.build();
 

-        Set<String> members = groupStore.getGroup(groupId).members;
+        GroupInfo g = groupStore.getGroup(groupId);
+        if (g == null) {
+            throw new GroupNotFoundException(groupId);
+        }
+        Set<String> members = g.members;

         members.remove(this.username);
         sendMessage(message, members);
     }
         members.remove(this.username);
         sendMessage(message, members);
     }


@@ -450,6 +454,9 @@ class Manager implements Signal {
                 .build();
 
         final GroupInfo g = groupStore.getGroup(groupId);
                 .build();
 
         final GroupInfo g = groupStore.getGroup(groupId);

+        if (g == null) {
+            throw new GroupNotFoundException(groupId);
+        }

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


@@ -464,6 +471,9 @@ class Manager implements Signal {
             g.members.add(username);
         } else {
             g = groupStore.getGroup(groupId);
             g.members.add(username);
         } else {
             g = groupStore.getGroup(groupId);

+            if (g == null) {
+                throw new GroupNotFoundException(groupId);
+            }

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


@@ -623,18 +633,17 @@ class Manager implements Signal {
     }
 
     public interface ReceiveMessageHandler {
     }
 
     public interface ReceiveMessageHandler {

-        void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent, GroupInfo group);
+        void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent decryptedContent);

     }
 
     }
 

-    private GroupInfo handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, String destination) {
-        GroupInfo group = null;
+    private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, String source, String destination) {

         if (message.getGroupInfo().isPresent()) {
             SignalServiceGroup groupInfo = message.getGroupInfo().get();
             switch (groupInfo.getType()) {
                 case UPDATE:
         if (message.getGroupInfo().isPresent()) {
             SignalServiceGroup groupInfo = message.getGroupInfo().get();
             switch (groupInfo.getType()) {
                 case UPDATE:

-                    try {
-                        group = groupStore.getGroup(groupInfo.getGroupId());
-                    } catch (GroupNotFoundException e) {
+                    GroupInfo group;
+                    group = groupStore.getGroup(groupInfo.getGroupId());
+                    if (group == null) {

                         group = new GroupInfo(groupInfo.getGroupId());
                     }
 
                         group = new GroupInfo(groupInfo.getGroupId());
                     }
 


@@ -663,17 +672,12 @@ class Manager implements Signal {
                     groupStore.updateGroup(group);
                     break;
                 case DELIVER:
                     groupStore.updateGroup(group);
                     break;
                 case DELIVER:

-                    try {
-                        group = groupStore.getGroup(groupInfo.getGroupId());
-                    } catch (GroupNotFoundException e) {
-                    }

                     break;
                 case QUIT:
                     break;
                 case QUIT:

-                    try {
-                        group = groupStore.getGroup(groupInfo.getGroupId());
+                    group = groupStore.getGroup(groupInfo.getGroupId());
+                    if (group != null) {

                         group.members.remove(source);
                         groupStore.updateGroup(group);
                         group.members.remove(source);
                         groupStore.updateGroup(group);

-                    } catch (GroupNotFoundException e) {

                     }
                     break;
             }
                     }
                     break;
             }


@@ -692,7 +696,6 @@ class Manager implements Signal {
                 }
             }
         }
                 }
             }
         }

-        return group;

     }
 
     public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {
     }
 
     public void receiveMessages(int timeoutSeconds, boolean returnOnTimeout, ReceiveMessageHandler handler) throws IOException {


@@ -705,7 +708,6 @@ class Manager implements Signal {
             while (true) {
                 SignalServiceEnvelope envelope;
                 SignalServiceContent content = null;
             while (true) {
                 SignalServiceEnvelope envelope;
                 SignalServiceContent content = null;

-                GroupInfo group = null;

                 try {
                     envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
                     if (!envelope.isReceipt()) {
                 try {
                     envelope = messagePipe.read(timeoutSeconds, TimeUnit.SECONDS);
                     if (!envelope.isReceipt()) {


@@ -713,13 +715,13 @@ class Manager implements Signal {
                         if (content != null) {
                             if (content.getDataMessage().isPresent()) {
                                 SignalServiceDataMessage message = content.getDataMessage().get();
                         if (content != null) {
                             if (content.getDataMessage().isPresent()) {
                                 SignalServiceDataMessage message = content.getDataMessage().get();

-                                group = handleSignalServiceDataMessage(message, false, envelope.getSource(), username);
+                                handleSignalServiceDataMessage(message, false, envelope.getSource(), username);

                             }
                             if (content.getSyncMessage().isPresent()) {
                                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                                 if (syncMessage.getSent().isPresent()) {
                                     SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();
                             }
                             if (content.getSyncMessage().isPresent()) {
                                 SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
                                 if (syncMessage.getSent().isPresent()) {
                                     SignalServiceDataMessage message = syncMessage.getSent().get().getMessage();

-                                    group = handleSignalServiceDataMessage(message, true, envelope.getSource(), syncMessage.getSent().get().getDestination().get());
+                                    handleSignalServiceDataMessage(message, true, envelope.getSource(), syncMessage.getSent().get().getDestination().get());

                                 }
                                 if (syncMessage.getRequest().isPresent()) {
                                     RequestMessage rm = syncMessage.getRequest().get();
                                 }
                                 if (syncMessage.getRequest().isPresent()) {
                                     RequestMessage rm = syncMessage.getRequest().get();


@@ -747,10 +749,8 @@ class Manager implements Signal {
                                         DeviceGroupsInputStream s = new DeviceGroupsInputStream(retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer()));
                                         DeviceGroup g;
                                         while ((g = s.read()) != null) {
                                         DeviceGroupsInputStream s = new DeviceGroupsInputStream(retrieveAttachmentAsStream(syncMessage.getGroups().get().asPointer()));
                                         DeviceGroup g;
                                         while ((g = s.read()) != null) {

-                                            GroupInfo syncGroup;
-                                            try {
-                                                syncGroup = groupStore.getGroup(g.getId());
-                                            } catch (GroupNotFoundException e) {
+                                            GroupInfo syncGroup = groupStore.getGroup(g.getId());
+                                            if (syncGroup == null) {

                                                 syncGroup = new GroupInfo(g.getId());
                                             }
                                             if (g.getName().isPresent()) {
                                                 syncGroup = new GroupInfo(g.getId());
                                             }
                                             if (g.getName().isPresent()) {


@@ -796,7 +796,7 @@ class Manager implements Signal {
                         }
                     }
                     save();
                         }
                     }
                     save();

-                    handler.handleMessage(envelope, content, group);
+                    handler.handleMessage(envelope, content);

                 } catch (TimeoutException e) {
                     if (returnOnTimeout)
                         return;
                 } catch (TimeoutException e) {
                     if (returnOnTimeout)
                         return;


@@ -892,7 +892,7 @@ class Manager implements Signal {
             try {
                 for (GroupInfo record : groupStore.getGroups()) {
                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),
             try {
                 for (GroupInfo record : groupStore.getGroups()) {
                     out.write(new DeviceGroup(record.groupId, Optional.fromNullable(record.name),

-                            new ArrayList<>(record.members), Optional.<SignalServiceAttachmentStream>absent(), // TODO
+                            new ArrayList<>(record.members), Optional.<SignalServiceAttachmentStream>absent(), // TODO add avatar

                             record.active));
                 }
             } finally {
                             record.active));
                 }
             } finally {


@@ -922,7 +922,7 @@ class Manager implements Signal {
             try {
                 for (ContactInfo record : contactStore.getContacts()) {
                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),
             try {
                 for (ContactInfo record : contactStore.getContacts()) {
                     out.write(new DeviceContact(record.number, Optional.fromNullable(record.name),

-                            Optional.<SignalServiceAttachmentStream>absent())); // TODO
+                            Optional.<SignalServiceAttachmentStream>absent())); // TODO add avatar

                 }
             } finally {
                 out.close();
                 }
             } finally {
                 out.close();


@@ -946,4 +946,8 @@ class Manager implements Signal {
     public ContactInfo getContact(String number) {
         return contactStore.getContact(number);
     }
     public ContactInfo getContact(String number) {
         return contactStore.getContact(number);
     }

+
+    public GroupInfo getGroup(byte[] groupId) {
+        return groupStore.getGroup(groupId);
+    }

 }
 }