Update libsignal-service-java

[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 d253b197e5a43c700409adc0aab05010cf914669..e2c92bac2e8a2a4c17d7ddcf3b8fb95a980f42e4 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -1,21 +1,44 @@
 package org.asamk.signal.json;
 
 package org.asamk.signal.json;
 

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

 import org.asamk.Signal;
 import org.asamk.Signal;

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

 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 
 import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
 

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

 class JsonSyncDataMessage extends JsonDataMessage {
 
 class JsonSyncDataMessage extends JsonDataMessage {
 

-    String destination;
+    @JsonProperty
+    @Deprecated
+    final String destination;
+
+    @JsonProperty
+    final String destinationNumber;
+
+    @JsonProperty
+    final String destinationUuid;
+
+    JsonSyncDataMessage(SentTranscriptMessage transcriptMessage, Manager m) {
+        super(transcriptMessage.getMessage(), m);

 
 

-    JsonSyncDataMessage(SentTranscriptMessage transcriptMessage) {
-        super(transcriptMessage.getMessage());

         if (transcriptMessage.getDestination().isPresent()) {
         if (transcriptMessage.getDestination().isPresent()) {

-            this.destination = transcriptMessage.getDestination().get().getNumber().get();
+            final var address = transcriptMessage.getDestination().get();
+            this.destination = getLegacyIdentifier(address);
+            this.destinationNumber = address.getNumber().orNull();
+            this.destinationUuid = address.getUuid().toString();
+        } 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;

     }
 }
     }
 }