Merge branch 'master' into dbus_sendviewed

[signal-cli] / src / main / java / org / asamk / signal / json / JsonMessageEnvelope.java

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index 256b9751bef06753eaa5dda1131b4d4e5a5dd7da..f5d70d28a61d7bb2bdc62ae3993343651490b3d3 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -1,121 +1,146 @@
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonInclude;

-import com.fasterxml.jackson.annotation.JsonProperty;

 
 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.UntrustedIdentityException;
+import org.asamk.signal.manager.api.RecipientIdentifier;

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

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+import org.whispersystems.signalservice.api.util.InvalidNumberException;

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

-public class JsonMessageEnvelope {
-
-    @JsonProperty
-    final String source;
-
-    @JsonProperty
-    final Integer sourceDevice;
-
-    @JsonProperty
-    final String relay;
-
-    @JsonProperty
-    final long timestamp;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonDataMessage dataMessage;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonSyncMessage syncMessage;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonCallMessage callMessage;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonReceiptMessage receiptMessage;
-
-    @JsonProperty
-    @JsonInclude(JsonInclude.Include.NON_NULL)
-    final JsonTypingMessage typingMessage;
-
-    public JsonMessageEnvelope(SignalServiceEnvelope envelope, SignalServiceContent content, Manager m) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
-            SignalServiceAddress source = envelope.getSourceAddress();
-            this.source = source.getLegacyIdentifier();
-            this.sourceDevice = envelope.getSourceDevice();
-            this.relay = source.getRelay().orNull();
+import static org.asamk.signal.util.Util.getLegacyIdentifier;
+
+public record JsonMessageEnvelope(
+        @Deprecated String source,
+        String sourceNumber,
+        String sourceUuid,
+        String sourceName,
+        Integer sourceDevice,
+        long timestamp,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonDataMessage dataMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonSyncMessage syncMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonCallMessage callMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonReceiptMessage receiptMessage,
+        @JsonInclude(JsonInclude.Include.NON_NULL) JsonTypingMessage typingMessage
+) {
+
+    public static JsonMessageEnvelope from(
+            SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception, Manager m
+    ) {
+        final String source;
+        final String sourceNumber;
+        final String sourceUuid;
+        final Integer sourceDevice;
+        if (!envelope.isUnidentifiedSender() && envelope.hasSourceUuid()) {
+            final var sourceAddress = m.resolveSignalServiceAddress(envelope.getSourceAddress());
+            source = getLegacyIdentifier(sourceAddress);
+            sourceNumber = sourceAddress.getNumber().orNull();
+            sourceUuid = sourceAddress.getUuid().toString();
+            sourceDevice = envelope.getSourceDevice();

         } else if (envelope.isUnidentifiedSender() && content != null) {
         } else if (envelope.isUnidentifiedSender() && content != null) {

-            this.source = content.getSender().getLegacyIdentifier();
-            this.sourceDevice = content.getSenderDevice();
-            this.relay = null;
+            final var sender = m.resolveSignalServiceAddress(content.getSender());
+            source = getLegacyIdentifier(sender);
+            sourceNumber = sender.getNumber().orNull();
+            sourceUuid = sender.getUuid().toString();
+            sourceDevice = content.getSenderDevice();
+        } else if (exception instanceof UntrustedIdentityException e) {
+            final var sender = m.resolveSignalServiceAddress(e.getSender());
+            source = getLegacyIdentifier(sender);
+            sourceNumber = sender.getNumber().orNull();
+            sourceUuid = sender.getUuid().toString();
+            sourceDevice = e.getSenderDevice();

         } else {
         } else {

-            this.source = null;
-            this.sourceDevice = null;
-            this.relay = null;
+            source = null;
+            sourceNumber = null;
+            sourceUuid = null;
+            sourceDevice = null;

         }
         }

-        this.timestamp = envelope.getTimestamp();
+        String name;
+        try {
+            name = m.getContactOrProfileName(RecipientIdentifier.Single.fromString(source, m.getSelfNumber()));
+        } catch (InvalidNumberException | NullPointerException e) {
+            name = null;
+        }
+        final var sourceName = name;
+        final var timestamp = envelope.getTimestamp();
+        final JsonReceiptMessage receiptMessage;

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

-            this.receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));
+            receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));

         } else if (content != null && content.getReceiptMessage().isPresent()) {
         } else if (content != null && content.getReceiptMessage().isPresent()) {

-            this.receiptMessage = new JsonReceiptMessage(content.getReceiptMessage().get());
+            receiptMessage = JsonReceiptMessage.from(content.getReceiptMessage().get());

         } else {
         } else {

-            this.receiptMessage = null;
+            receiptMessage = null;

         }
         }

-        this.typingMessage = content != null && content.getTypingMessage().isPresent()
-                ? new JsonTypingMessage(content.getTypingMessage().get())
-                : null;
+        final var typingMessage = content != null && content.getTypingMessage().isPresent() ? JsonTypingMessage.from(
+                content.getTypingMessage().get()) : null;

 
 

-        this.dataMessage = content != null && content.getDataMessage().isPresent()
-                ? new JsonDataMessage(content.getDataMessage().get(), m)
+        final var dataMessage = content != null && content.getDataMessage().isPresent()
+                ? JsonDataMessage.from(content.getDataMessage().get(), m)

                 : null;
                 : null;

-        this.syncMessage = content != null && content.getSyncMessage().isPresent()
-                ? new JsonSyncMessage(content.getSyncMessage().get(), m)
+        final var syncMessage = content != null && content.getSyncMessage().isPresent()
+                ? JsonSyncMessage.from(content.getSyncMessage().get(), m)

                 : null;
                 : null;

-        this.callMessage = content != null && content.getCallMessage().isPresent()
-                ? new JsonCallMessage(content.getCallMessage().get())
+        final var callMessage = content != null && content.getCallMessage().isPresent()
+                ? JsonCallMessage.from(content.getCallMessage().get())

                 : null;
                 : null;

+
+        return new JsonMessageEnvelope(source,
+                sourceNumber,
+                sourceUuid,
+                sourceName,
+                sourceDevice,
+                timestamp,
+                dataMessage,
+                syncMessage,
+                callMessage,
+                receiptMessage,
+                typingMessage);

     }
 
     }
 

-    public JsonMessageEnvelope(Signal.MessageReceived messageReceived) {
-        source = messageReceived.getSender();
-        sourceDevice = null;
-        relay = null;
-        timestamp = messageReceived.getTimestamp();
-        receiptMessage = null;
-        dataMessage = new JsonDataMessage(messageReceived);
-        syncMessage = null;
-        callMessage = null;
-        typingMessage = null;
+    public static JsonMessageEnvelope from(Signal.MessageReceived messageReceived) {
+        return new JsonMessageEnvelope(messageReceived.getSource(),
+                null,
+                null,
+                null,
+                null,
+                messageReceived.getTimestamp(),
+                JsonDataMessage.from(messageReceived),
+                null,
+                null,
+                null,
+                null);

     }
 
     }
 

-    public JsonMessageEnvelope(Signal.ReceiptReceived receiptReceived) {
-        source = receiptReceived.getSender();
-        sourceDevice = null;
-        relay = null;
-        timestamp = receiptReceived.getTimestamp();
-        receiptMessage = JsonReceiptMessage.deliveryReceipt(timestamp, List.of(timestamp));
-        dataMessage = null;
-        syncMessage = null;
-        callMessage = null;
-        typingMessage = null;
+    public static JsonMessageEnvelope from(Signal.ReceiptReceived receiptReceived) {
+        return new JsonMessageEnvelope(receiptReceived.getSender(),
+                null,
+                null,
+                null,
+                null,
+                receiptReceived.getTimestamp(),
+                null,
+                null,
+                null,
+                JsonReceiptMessage.deliveryReceipt(receiptReceived.getTimestamp(),
+                        List.of(receiptReceived.getTimestamp())),
+                null);

     }
 
     }
 

-    public JsonMessageEnvelope(Signal.SyncMessageReceived messageReceived) {
-        source = messageReceived.getSource();
-        sourceDevice = null;
-        relay = null;
-        timestamp = messageReceived.getTimestamp();
-        receiptMessage = null;
-        dataMessage = null;
-        syncMessage = new JsonSyncMessage(messageReceived);
-        callMessage = null;
-        typingMessage = null;
+    public static JsonMessageEnvelope from(Signal.SyncMessageReceived messageReceived) {
+        return new JsonMessageEnvelope(messageReceived.getSource(),
+                null,
+                null,
+                null,
+                null,
+                messageReceived.getTimestamp(),
+                null,
+                JsonSyncMessage.from(messageReceived),
+                null,
+                null,
+                null);

     }
 }
     }
 }