X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/6d016bcfc97c49deb76fa2c3a07ce62aee4ca8d8..6a1b7dc5975161f59fbb1012dd340c7b6e0198f7:/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
index 5973d019..4e4c33cf 100644
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -61,16 +61,17 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
             } else if (content.getDataMessage().isPresent()) {
                 SignalServiceDataMessage message = content.getDataMessage().get();
 
+                byte[] groupId = getGroupId(m, message);
                 if (!message.isEndSession() &&
-                        !(message.getGroupContext().isPresent() &&
-                                message.getGroupContext().get().getGroupV1Type() != SignalServiceGroup.Type.DELIVER)) {
+                        (groupId == null
+                                || message.getGroupContext().get().getGroupV1Type() == null
+                                || message.getGroupContext().get().getGroupV1Type() == SignalServiceGroup.Type.DELIVER)) {
                     try {
                         conn.sendMessage(new Signal.MessageReceived(
                                 objectPath,
                                 message.getTimestamp(),
                                 sender.getLegacyIdentifier(),
-                                message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()
-                                        ? message.getGroupContext().get().getGroupV1().get().getGroupId() : new byte[0],
+                                groupId != null ? groupId : new byte[0],
                                 message.getBody().isPresent() ? message.getBody().get() : "",
                                 JsonDbusReceiveMessageHandler.getAttachments(message, m)));
                     } catch (DBusException e) {
@@ -84,6 +85,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
 
                     if (transcript.getDestination().isPresent() || transcript.getMessage().getGroupContext().isPresent()) {
                         SignalServiceDataMessage message = transcript.getMessage();
+                        byte[] groupId = getGroupId(m, message);
 
                         try {
                             conn.sendMessage(new Signal.SyncMessageReceived(
@@ -91,8 +93,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                                     transcript.getTimestamp(),
                                     sender.getLegacyIdentifier(),
                                     transcript.getDestination().isPresent() ? transcript.getDestination().get().getLegacyIdentifier() : "",
-                                    message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()
-                                            ? message.getGroupContext().get().getGroupV1().get().getGroupId() : new byte[0],
+                                    groupId != null ? groupId : new byte[0],
                                     message.getBody().isPresent() ? message.getBody().get() : "",
                                     JsonDbusReceiveMessageHandler.getAttachments(message, m)));
                         } catch (DBusException e) {
@@ -104,6 +105,22 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
         }
     }
 
+    private static byte[] getGroupId(final Manager m, final SignalServiceDataMessage message) {
+        byte[] groupId;
+        if (message.getGroupContext().isPresent()) {
+            if (message.getGroupContext().get().getGroupV1().isPresent()) {
+                groupId = message.getGroupContext().get().getGroupV1().get().getGroupId();
+            } else if (message.getGroupContext().get().getGroupV2().isPresent()) {
+                groupId = m.getGroupId(message.getGroupContext().get().getGroupV2().get().getMasterKey());
+            } else {
+                groupId = null;
+            }
+        } else {
+            groupId = null;
+        }
+        return groupId;
+    }
+
     static private List<String> getAttachments(SignalServiceDataMessage message, Manager m) {
         List<String> attachments = new ArrayList<>();
         if (message.getAttachments().isPresent()) {