Update libsignal-service-java

[signal-cli] / 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 41b91a4869714ff7ea8733a635c101c1fee2d556..9433d20914bf479e3f7487c3ee1348e8299bd32b 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -1,31 +1,30 @@
 package org.asamk.signal;
 
 import org.asamk.Signal;
 package org.asamk.signal;
 
 import org.asamk.Signal;

-import org.asamk.signal.manager.GroupUtils;

 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.groups.GroupUtils;

 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.connections.impl.DBusConnection;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;

 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
 import org.whispersystems.signalservice.api.messages.SignalServiceContent;
 import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
 import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
 import org.whispersystems.signalservice.api.messages.SignalServiceGroup;

-import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;

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

+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+

 public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
 
     private final DBusConnection conn;
 
     private final String objectPath;
 
 public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
 
     private final DBusConnection conn;
 
     private final String objectPath;
 

-    public JsonDbusReceiveMessageHandler(Manager m, DBusConnection conn, final String objectPath) {
-        super(m);
+    public JsonDbusReceiveMessageHandler(
+            Manager m, JsonWriter jsonWriter, DBusConnection conn, final String objectPath
+    ) {
+        super(m, jsonWriter);

         this.conn = conn;
         this.objectPath = objectPath;
     }
         this.conn = conn;
         this.objectPath = objectPath;
     }


@@ -41,31 +40,31 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
             try {
                 conn.sendMessage(new Signal.ReceiptReceived(objectPath, envelope.getTimestamp(),
                         // A receipt envelope always has a source address
             try {
                 conn.sendMessage(new Signal.ReceiptReceived(objectPath, envelope.getTimestamp(),
                         // A receipt envelope always has a source address

-                        envelope.getSourceAddress().getLegacyIdentifier()));
+                        getLegacyIdentifier(envelope.getSourceAddress())));

             } catch (DBusException e) {
                 e.printStackTrace();
             }
         } else if (content != null) {
             } catch (DBusException e) {
                 e.printStackTrace();
             }
         } else if (content != null) {

-            final SignalServiceAddress sender = !envelope.isUnidentifiedSender() && envelope.hasSource()
+            final var sender = !envelope.isUnidentifiedSender() && envelope.hasSourceUuid()

                     ? envelope.getSourceAddress()
                     : content.getSender();
             if (content.getReceiptMessage().isPresent()) {
                     ? envelope.getSourceAddress()
                     : content.getSender();
             if (content.getReceiptMessage().isPresent()) {

-                final SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
+                final var receiptMessage = content.getReceiptMessage().get();

                 if (receiptMessage.isDeliveryReceipt()) {
                     for (long timestamp : receiptMessage.getTimestamps()) {
                         try {
                             conn.sendMessage(new Signal.ReceiptReceived(objectPath,
                                     timestamp,
                 if (receiptMessage.isDeliveryReceipt()) {
                     for (long timestamp : receiptMessage.getTimestamps()) {
                         try {
                             conn.sendMessage(new Signal.ReceiptReceived(objectPath,
                                     timestamp,

-                                    sender.getLegacyIdentifier()));
+                                    getLegacyIdentifier(sender)));

                         } catch (DBusException e) {
                             e.printStackTrace();
                         }
                     }
                 }
             } else if (content.getDataMessage().isPresent()) {
                         } catch (DBusException e) {
                             e.printStackTrace();
                         }
                     }
                 }
             } else if (content.getDataMessage().isPresent()) {

-                SignalServiceDataMessage message = content.getDataMessage().get();
+                var message = content.getDataMessage().get();

 
 

-                byte[] groupId = getGroupId(m, message);
+                var groupId = getGroupId(message);

                 if (!message.isEndSession() && (
                         groupId == null
                                 || message.getGroupContext().get().getGroupV1Type() == null
                 if (!message.isEndSession() && (
                         groupId == null
                                 || message.getGroupContext().get().getGroupV1Type() == null


@@ -74,7 +73,7 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                     try {
                         conn.sendMessage(new Signal.MessageReceived(objectPath,
                                 message.getTimestamp(),
                     try {
                         conn.sendMessage(new Signal.MessageReceived(objectPath,
                                 message.getTimestamp(),

-                                sender.getLegacyIdentifier(),
+                                getLegacyIdentifier(sender),

                                 groupId != null ? groupId : new byte[0],
                                 message.getBody().isPresent() ? message.getBody().get() : "",
                                 JsonDbusReceiveMessageHandler.getAttachments(message, m)));
                                 groupId != null ? groupId : new byte[0],
                                 message.getBody().isPresent() ? message.getBody().get() : "",
                                 JsonDbusReceiveMessageHandler.getAttachments(message, m)));


@@ -83,23 +82,23 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
                     }
                 }
             } else if (content.getSyncMessage().isPresent()) {
                     }
                 }
             } else if (content.getSyncMessage().isPresent()) {

-                SignalServiceSyncMessage sync_message = content.getSyncMessage().get();
+                var sync_message = content.getSyncMessage().get();

                 if (sync_message.getSent().isPresent()) {
                 if (sync_message.getSent().isPresent()) {

-                    SentTranscriptMessage transcript = sync_message.getSent().get();
+                    var transcript = sync_message.getSent().get();

 
                     if (transcript.getDestination().isPresent() || transcript.getMessage()
                             .getGroupContext()
                             .isPresent()) {
 
                     if (transcript.getDestination().isPresent() || transcript.getMessage()
                             .getGroupContext()
                             .isPresent()) {

-                        SignalServiceDataMessage message = transcript.getMessage();
-                        byte[] groupId = getGroupId(m, message);
+                        var message = transcript.getMessage();
+                        var groupId = getGroupId(message);

 
                         try {
                             conn.sendMessage(new Signal.SyncMessageReceived(objectPath,
                                     transcript.getTimestamp(),
 
                         try {
                             conn.sendMessage(new Signal.SyncMessageReceived(objectPath,
                                     transcript.getTimestamp(),

-                                    sender.getLegacyIdentifier(),
-                                    transcript.getDestination().isPresent() ? transcript.getDestination()
-                                            .get()
-                                            .getLegacyIdentifier() : "",
+                                    getLegacyIdentifier(sender),
+                                    transcript.getDestination().isPresent()
+                                            ? getLegacyIdentifier(transcript.getDestination().get())
+                                            : "",

                                     groupId != null ? groupId : new byte[0],
                                     message.getBody().isPresent() ? message.getBody().get() : "",
                                     JsonDbusReceiveMessageHandler.getAttachments(message, m)));
                                     groupId != null ? groupId : new byte[0],
                                     message.getBody().isPresent() ? message.getBody().get() : "",
                                     JsonDbusReceiveMessageHandler.getAttachments(message, m)));


@@ -112,26 +111,15 @@ 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 = GroupUtils.getGroupId(message.getGroupContext().get().getGroupV2().get().getMasterKey());
-            } else {
-                groupId = null;
-            }
-        } else {
-            groupId = null;
-        }
-        return groupId;
+    private static byte[] getGroupId(final SignalServiceDataMessage message) {
+        return message.getGroupContext().isPresent() ? GroupUtils.getGroupId(message.getGroupContext().get())
+                .serialize() : null;

     }
 
     static private List<String> getAttachments(SignalServiceDataMessage message, Manager m) {
     }
 
     static private List<String> getAttachments(SignalServiceDataMessage message, Manager m) {

-        List<String> attachments = new ArrayList<>();
+        var attachments = new ArrayList<String>();

         if (message.getAttachments().isPresent()) {
         if (message.getAttachments().isPresent()) {

-            for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+            for (var attachment : message.getAttachments().get()) {

                 if (attachment.isPointer()) {
                     attachments.add(m.getAttachmentFile(attachment.asPointer().getRemoteId()).getAbsolutePath());
                 }
                 if (attachment.isPointer()) {
                     attachments.add(m.getAttachmentFile(attachment.asPointer().getRemoteId()).getAbsolutePath());
                 }