Update dependencies

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

diff --git a/src/main/java/org/asamk/signal/JsonDataMessage.java b/src/main/java/org/asamk/signal/JsonDataMessage.java
index 34f6249e3e5ba8c46a29547fd3f6c22395bfc5c4..efd8e53ebd71508dd10606f26e7cd50eb9ebde22 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDataMessage.java
+++ b/src/main/java/org/asamk/signal/JsonDataMessage.java
@@ -2,6 +2,7 @@ package org.asamk.signal;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 
 import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;

+import org.whispersystems.signalservice.api.messages.SignalServiceGroup;

 
 import java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;


@@ -16,8 +17,9 @@ class JsonDataMessage {
 
     JsonDataMessage(SignalServiceDataMessage dataMessage) {
         this.timestamp = dataMessage.getTimestamp();
 
     JsonDataMessage(SignalServiceDataMessage dataMessage) {
         this.timestamp = dataMessage.getTimestamp();

-        if (dataMessage.getGroupInfo().isPresent()) {
-            this.groupInfo = new JsonGroupInfo(dataMessage.getGroupInfo().get());
+        if (dataMessage.getGroupContext().isPresent() && dataMessage.getGroupContext().get().getGroupV1().isPresent()) {
+            SignalServiceGroup groupInfo = dataMessage.getGroupContext().get().getGroupV1().get();
+            this.groupInfo = new JsonGroupInfo(groupInfo);

         }
         if (dataMessage.getBody().isPresent()) {
             this.message = dataMessage.getBody().get();
         }
         if (dataMessage.getBody().isPresent()) {
             this.message = dataMessage.getBody().get();