]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/JsonDataMessage.java
Update dependencies
[signal-cli] / src / main / java / org / asamk / signal / JsonDataMessage.java
index eda54025e8036d528ec0c3cdd585b0e8bb9973b3..efd8e53ebd71508dd10606f26e7cd50eb9ebde22 100644 (file)
@@ -2,11 +2,13 @@ package org.asamk.signal;
 
 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;
 
 class JsonDataMessage {
+
     long timestamp;
     String message;
     int expiresInSeconds;
@@ -15,8 +17,9 @@ class JsonDataMessage {
 
     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();