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 c0977c0f20162686068733774aede795f6071c93..9433d20914bf479e3f7487c3ee1348e8299bd32b 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -2,64 +2,130 @@ package org.asamk.signal;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;

-import org.freedesktop.dbus.DBusConnection;
+import org.asamk.signal.manager.groups.GroupUtils;
+import org.freedesktop.dbus.connections.impl.DBusConnection;

 import org.freedesktop.dbus.exceptions.DBusException;
 import org.freedesktop.dbus.exceptions.DBusException;

-import org.whispersystems.signalservice.api.messages.*;
+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 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;
     }
 

-    static void sendReceivedMessageToDbus(SignalServiceEnvelope envelope, SignalServiceContent content, DBusConnection conn, final String objectPath, Manager m) {
+    static void sendReceivedMessageToDbus(
+            SignalServiceEnvelope envelope,
+            SignalServiceContent content,
+            DBusConnection conn,
+            final String objectPath,
+            Manager m
+    ) {

         if (envelope.isReceipt()) {
             try {
         if (envelope.isReceipt()) {
             try {

-                conn.sendSignal(new Signal.ReceiptReceived(
-                        objectPath,
-                        envelope.getTimestamp(),
-                        envelope.getSource()
-                ));
+                conn.sendMessage(new Signal.ReceiptReceived(objectPath, envelope.getTimestamp(),
+                        // A receipt envelope always has a source address
+                        getLegacyIdentifier(envelope.getSourceAddress())));

             } catch (DBusException e) {
                 e.printStackTrace();
             }
             } catch (DBusException e) {
                 e.printStackTrace();
             }

-        } else if (content != null && content.getDataMessage().isPresent()) {
-            SignalServiceDataMessage message = content.getDataMessage().get();
+        } else if (content != null) {
+            final var sender = !envelope.isUnidentifiedSender() && envelope.hasSourceUuid()
+                    ? envelope.getSourceAddress()
+                    : content.getSender();
+            if (content.getReceiptMessage().isPresent()) {
+                final var receiptMessage = content.getReceiptMessage().get();
+                if (receiptMessage.isDeliveryReceipt()) {
+                    for (long timestamp : receiptMessage.getTimestamps()) {
+                        try {
+                            conn.sendMessage(new Signal.ReceiptReceived(objectPath,
+                                    timestamp,
+                                    getLegacyIdentifier(sender)));
+                        } catch (DBusException e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            } else if (content.getDataMessage().isPresent()) {
+                var message = content.getDataMessage().get();
+
+                var groupId = getGroupId(message);
+                if (!message.isEndSession() && (
+                        groupId == null
+                                || message.getGroupContext().get().getGroupV1Type() == null
+                                || message.getGroupContext().get().getGroupV1Type() == SignalServiceGroup.Type.DELIVER
+                )) {
+                    try {
+                        conn.sendMessage(new Signal.MessageReceived(objectPath,
+                                message.getTimestamp(),
+                                getLegacyIdentifier(sender),
+                                groupId != null ? groupId : new byte[0],
+                                message.getBody().isPresent() ? message.getBody().get() : "",
+                                JsonDbusReceiveMessageHandler.getAttachments(message, m)));
+                    } catch (DBusException e) {
+                        e.printStackTrace();
+                    }
+                }
+            } else if (content.getSyncMessage().isPresent()) {
+                var sync_message = content.getSyncMessage().get();
+                if (sync_message.getSent().isPresent()) {
+                    var transcript = sync_message.getSent().get();

 
 

-            if (!message.isEndSession() &&
-                    !(message.getGroupInfo().isPresent() &&
-                            message.getGroupInfo().get().getType() != SignalServiceGroup.Type.DELIVER)) {
-                List<String> attachments = new ArrayList<>();
-                if (message.getAttachments().isPresent()) {
-                    for (SignalServiceAttachment attachment : message.getAttachments().get()) {
-                        if (attachment.isPointer()) {
-                            attachments.add(m.getAttachmentFile(attachment.asPointer().getId()).getAbsolutePath());
+                    if (transcript.getDestination().isPresent() || transcript.getMessage()
+                            .getGroupContext()
+                            .isPresent()) {
+                        var message = transcript.getMessage();
+                        var groupId = getGroupId(message);
+
+                        try {
+                            conn.sendMessage(new Signal.SyncMessageReceived(objectPath,
+                                    transcript.getTimestamp(),
+                                    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)));
+                        } catch (DBusException e) {
+                            e.printStackTrace();

                         }
                     }
                 }
                         }
                     }
                 }

+            }
+        }
+    }
+
+    private static byte[] getGroupId(final SignalServiceDataMessage message) {
+        return message.getGroupContext().isPresent() ? GroupUtils.getGroupId(message.getGroupContext().get())
+                .serialize() : null;
+    }

 
 

-                try {
-                    conn.sendSignal(new Signal.MessageReceived(
-                            objectPath,
-                            message.getTimestamp(),
-                            envelope.getSource(),
-                            message.getGroupInfo().isPresent() ? message.getGroupInfo().get().getGroupId() : new byte[0],
-                            message.getBody().isPresent() ? message.getBody().get() : "",
-                            attachments));
-                } catch (DBusException e) {
-                    e.printStackTrace();
+    static private List<String> getAttachments(SignalServiceDataMessage message, Manager m) {
+        var attachments = new ArrayList<String>();
+        if (message.getAttachments().isPresent()) {
+            for (var attachment : message.getAttachments().get()) {
+                if (attachment.isPointer()) {
+                    attachments.add(m.getAttachmentFile(attachment.asPointer().getRemoteId()).getAbsolutePath());

                 }
             }
         }
                 }
             }
         }

+        return attachments;

     }
 
     @Override
     }
 
     @Override