Update dependencies

diff --git a/build.gradle b/build.gradle
index 0c842875e6b5a62548f32fbe779dffbfe110eeb2..e6cad8c84911092a989f147ac2e575502391ea13 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -20,7 +20,7 @@ repositories {
 }
 
 dependencies {
 }
 
 dependencies {

-    compile 'com.github.turasa:signal-service-java:2.15.3_unofficial_6'
+    compile 'com.github.turasa:signal-service-java:2.15.3_unofficial_7'

     compile 'org.bouncycastle:bcprov-jdk15on:1.64'
     compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'
     compile 'org.bouncycastle:bcprov-jdk15on:1.64'
     compile 'net.sourceforge.argparse4j:argparse4j:0.8.1'
     compile 'org.freedesktop.dbus:dbus-java:2.7.0'

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();

diff --git a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
index 6b26ea0ea5b9a57535ab073e9e107c989d028c56..14aa1fbd7126a7242608f32f5b3ab02d1bdb39c6 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -40,8 +40,8 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
             SignalServiceDataMessage message = content.getDataMessage().get();
 
             if (!message.isEndSession() &&
             SignalServiceDataMessage message = content.getDataMessage().get();
 
             if (!message.isEndSession() &&

-                    !(message.getGroupInfo().isPresent() &&
-                            message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
+                    !(message.getGroupContext().isPresent() &&
+                            message.getGroupContext().get().getGroupV1Type() != SignalServiceGroup.Type.DELIVER)) {

                 List<String> attachments = new ArrayList<>();
                 if (message.getAttachments().isPresent()) {
                     for (SignalServiceAttachment attachment : message.getAttachments().get()) {
                 List<String> attachments = new ArrayList<>();
                 if (message.getAttachments().isPresent()) {
                     for (SignalServiceAttachment attachment : message.getAttachments().get()) {


@@ -56,7 +56,8 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                             objectPath,
                             message.getTimestamp(),
                             envelope.isUnidentifiedSender() || !envelope.hasSource() ? content.getSender().getNumber().get() : envelope.getSourceE164().get(),
                             objectPath,
                             message.getTimestamp(),
                             envelope.isUnidentifiedSender() || !envelope.hasSource() ? content.getSender().getNumber().get() : envelope.getSourceE164().get(),

-                            message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
+                            message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()
+                                    ? message.getGroupContext().get().getGroupV1().get().getGroupId() : new byte[0],

                             message.getBody().isPresent() ? message.getBody().get() : "",
                             attachments));
                 } catch (DBusException e) {
                             message.getBody().isPresent() ? message.getBody().get() : "",
                             attachments));
                 } catch (DBusException e) {

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index faf8deec7b1b343620e39c50989f8b89abd778ff..fe3dd669e1e945ceda92e2beb67c7d3d37fc508d 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -254,8 +254,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (message.getBody().isPresent()) {
             System.out.println("Body: " + message.getBody().get());
         }
         if (message.getBody().isPresent()) {
             System.out.println("Body: " + message.getBody().get());
         }

-        if (message.getGroupInfo().isPresent()) {
-            SignalServiceGroup groupInfo = message.getGroupInfo().get();
+        if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
+            SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();

             System.out.println("Group info:");
             System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
             if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) {
             System.out.println("Group info:");
             System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
             if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) {

diff --git a/src/main/java/org/asamk/signal/manager/Manager.java b/src/main/java/org/asamk/signal/manager/Manager.java
index 1d55d88623e1d7e057b265db40906731cf9aed29..ccb2fbcecef06245ac8af4577b181fe42e3a98ca 100644 (file)
--- a/src/main/java/org/asamk/signal/manager/Manager.java
+++ b/src/main/java/org/asamk/signal/manager/Manager.java
@@ -1177,7 +1177,7 @@ public class Manager implements Signal {
             SignalServiceMessageSender messageSender = getMessageSender();
 
             message = messageBuilder.build();
             SignalServiceMessageSender messageSender = getMessageSender();
 
             message = messageBuilder.build();

-            if (message.getGroupInfo().isPresent()) {
+            if (message.getGroupContext().isPresent()) {

                 try {
                     final boolean isRecipientUpdate = false;
                     List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipients), getAccessFor(recipients), isRecipientUpdate, message);
                 try {
                     final boolean isRecipientUpdate = false;
                     List<SendMessageResult> result = messageSender.sendMessage(new ArrayList<>(recipients), getAccessFor(recipients), isRecipientUpdate, message);


@@ -1262,8 +1262,8 @@ public class Manager implements Signal {
     }
 
     private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, SignalServiceAddress source, SignalServiceAddress destination, boolean ignoreAttachments) {
     }
 
     private void handleSignalServiceDataMessage(SignalServiceDataMessage message, boolean isSync, SignalServiceAddress source, SignalServiceAddress destination, boolean ignoreAttachments) {

-        if (message.getGroupInfo().isPresent()) {
-            SignalServiceGroup groupInfo = message.getGroupInfo().get();
+        if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
+            SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();

             GroupInfo group = account.getGroupStore().getGroup(groupInfo.getGroupId());
             switch (groupInfo.getType()) {
                 case UPDATE:
             GroupInfo group = account.getGroupStore().getGroup(groupInfo.getGroupId());
             switch (groupInfo.getType()) {
                 case UPDATE:


@@ -1330,8 +1330,8 @@ public class Manager implements Signal {
             handleEndSession(isSync ? destination : source);
         }
         if (message.isExpirationUpdate() || message.getBody().isPresent()) {
             handleEndSession(isSync ? destination : source);
         }
         if (message.isExpirationUpdate() || message.getBody().isPresent()) {

-            if (message.getGroupInfo().isPresent()) {
-                SignalServiceGroup groupInfo = message.getGroupInfo().get();
+            if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
+                SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();

                 GroupInfo group = account.getGroupStore().getGroup(groupInfo.getGroupId());
                 if (group == null) {
                     group = new GroupInfo(groupInfo.getGroupId());
                 GroupInfo group = account.getGroupStore().getGroup(groupInfo.getGroupId());
                 if (group == null) {
                     group = new GroupInfo(groupInfo.getGroupId());


@@ -1528,8 +1528,8 @@ public class Manager implements Signal {
 
         if (content != null && content.getDataMessage().isPresent()) {
             SignalServiceDataMessage message = content.getDataMessage().get();
 
         if (content != null && content.getDataMessage().isPresent()) {
             SignalServiceDataMessage message = content.getDataMessage().get();

-            if (message.getGroupInfo().isPresent()) {
-                SignalServiceGroup groupInfo = message.getGroupInfo().get();
+            if (message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()) {
+                SignalServiceGroup groupInfo = message.getGroupContext().get().getGroupV1().get();

                 GroupInfo group = getGroup(groupInfo.getGroupId());
                 if (groupInfo.getType() == SignalServiceGroup.Type.DELIVER && group != null && group.blocked) {
                     return true;
                 GroupInfo group = getGroup(groupInfo.getGroupId());
                 if (groupInfo.getType() == SignalServiceGroup.Type.DELIVER && group != null && group.blocked) {
                     return true;