Extend json output with number and uuid fields

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

diff --git a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
index d93351f16d01b5a2b1da1fc7de6dd9817b2cea52..28c9d9369403a41fdd95d87bea0a082e21e2594f 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -5,23 +5,42 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 import org.asamk.Signal;
 import org.asamk.signal.manager.Manager;
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;

-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
+
+import java.util.UUID;
+
+import static org.asamk.signal.util.Util.getLegacyIdentifier;

 
 class JsonSyncDataMessage extends JsonDataMessage {
 
     @JsonProperty
 
 class JsonSyncDataMessage extends JsonDataMessage {
 
     @JsonProperty

+    @Deprecated

     final String destination;
 
     final String destination;
 

+    @JsonProperty
+    final String destinationNumber;
+
+    @JsonProperty
+    final String destinationUuid;
+

     JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, Manager m) {
         super(transcriptMessage.getMessage(), m);
 
     JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, Manager m) {
         super(transcriptMessage.getMessage(), m);
 

-        this.destination = transcriptMessage.getDestination()
-                .transform(SignalServiceAddress::getLegacyIdentifier)
-                .orNull();
+        if (transcriptMessage.getDestination().isPresent()) {
+            final var address = transcriptMessage.getDestination().get();
+            this.destination = getLegacyIdentifier(address);
+            this.destinationNumber = address.getNumber().orNull();
+            this.destinationUuid = address.getUuid().transform(UUID::toString).orNull();
+        } else {
+            this.destination = null;
+            this.destinationNumber = null;
+            this.destinationUuid = null;
+        }

     }
 
     JsonSyncDataMessage(Signal.SyncMessageReceived messageReceived) {
         super(messageReceived);
     }
 
     JsonSyncDataMessage(Signal.SyncMessageReceived messageReceived) {
         super(messageReceived);

-        destination = messageReceived.getDestination();
+        this.destination = messageReceived.getDestination();
+        this.destinationNumber = null;
+        this.destinationUuid = null;

     }
 }
     }
 }