Use PlainTextWriter for all cli stdout output

[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 0728b8719506b5c2ed5a3de851c457123572151b..e0bd793d83cdc2e224027f1ea7ce5c5fb2c8a1cc 100644 (file)
--- a/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/JsonDbusReceiveMessageHandler.java
@@ -2,16 +2,13 @@ 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.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 java.util.ArrayList;
 import java.util.List;
 
 import java.util.ArrayList;
 import java.util.List;


@@ -28,47 +25,52 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
         this.objectPath = objectPath;
     }
 
         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.sendMessage(new Signal.ReceiptReceived(
-                        objectPath,
-                        envelope.getTimestamp(),
-                        !envelope.isUnidentifiedSender() && envelope.hasSource() ? envelope.getSourceE164().get() : content.getSender().getNumber().get()
-                ));
+                conn.sendMessage(new Signal.ReceiptReceived(objectPath, envelope.getTimestamp(),
+                        // A receipt envelope always has a source address
+                        envelope.getSourceAddress().getLegacyIdentifier()));

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

+            final var sender = !envelope.isUnidentifiedSender() && envelope.hasSource()
+                    ? envelope.getSourceAddress()
+                    : content.getSender();

             if (content.getReceiptMessage().isPresent()) {
             if (content.getReceiptMessage().isPresent()) {

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

                 if (receiptMessage.isDeliveryReceipt()) {
                 if (receiptMessage.isDeliveryReceipt()) {

-                    final String sender = !envelope.isUnidentifiedSender() && envelope.hasSource() ? envelope.getSourceE164().get() : content.getSender().getNumber().get();

                     for (long timestamp : receiptMessage.getTimestamps()) {
                         try {
                     for (long timestamp : receiptMessage.getTimestamps()) {
                         try {

-                            conn.sendMessage(new Signal.ReceiptReceived(
-                                    objectPath,
+                            conn.sendMessage(new Signal.ReceiptReceived(objectPath,

                                     timestamp,
                                     timestamp,

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

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

 
 

-                if (!message.isEndSession() &&
-                        !(message.getGroupContext().isPresent() &&
-                                message.getGroupContext().get().getGroupV1Type() != SignalServiceGroup.Type.DELIVER)) {
+                var groupId = getGroupId(message);
+                if (!message.isEndSession() && (
+                        groupId == null
+                                || message.getGroupContext().get().getGroupV1Type() == null
+                                || message.getGroupContext().get().getGroupV1Type() == SignalServiceGroup.Type.DELIVER
+                )) {

                     try {
                     try {

-                        conn.sendMessage(new Signal.MessageReceived(
-                                objectPath,
+                        conn.sendMessage(new Signal.MessageReceived(objectPath,

                                 message.getTimestamp(),
                                 message.getTimestamp(),

-                                envelope.isUnidentifiedSender() || !envelope.hasSource() ? content.getSender().getNumber().get() : envelope.getSourceE164().get(),
-                                message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()
-                                        ? message.getGroupContext().get().getGroupV1().get().getGroupId() : new byte[0],
+                                sender.getLegacyIdentifier(),
+                                groupId != null ? groupId : new byte[0],

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


@@ -76,21 +78,24 @@ 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 (!envelope.isUnidentifiedSender() && envelope.hasSource() && (transcript.getDestination().isPresent() || transcript.getMessage().getGroupContext().isPresent())) {
-                        SignalServiceDataMessage message = transcript.getMessage();
+                    if (transcript.getDestination().isPresent() || transcript.getMessage()
+                            .getGroupContext()
+                            .isPresent()) {
+                        var message = transcript.getMessage();
+                        var groupId = getGroupId(message);

 
                         try {
 
                         try {

-                            conn.sendMessage(new Signal.SyncMessageReceived(
-                                    objectPath,
+                            conn.sendMessage(new Signal.SyncMessageReceived(objectPath,

                                     transcript.getTimestamp(),
                                     transcript.getTimestamp(),

-                                    envelope.getSourceAddress().getNumber().get(),
-                                    transcript.getDestination().isPresent() ? transcript.getDestination().get().getNumber().get() : "",
-                                    message.getGroupContext().isPresent() && message.getGroupContext().get().getGroupV1().isPresent()
-                                            ? message.getGroupContext().get().getGroupV1().get().getGroupId() : new byte[0],
+                                    sender.getLegacyIdentifier(),
+                                    transcript.getDestination().isPresent() ? transcript.getDestination()
+                                            .get()
+                                            .getLegacyIdentifier() : "",
+                                    groupId != null ? groupId : new byte[0],

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


@@ -102,10 +107,15 @@ public class JsonDbusReceiveMessageHandler extends JsonReceiveMessageHandler {
         }
     }
 
         }
     }
 

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