Convert RecipientAddress to record

[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 98139c84bd68811d074a92f3d52f38e86356910f..0accddc19790e8a53ba31d72711744c1e93b6d40 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -2,11 +2,9 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 

-import org.asamk.Signal;
-import org.asamk.signal.manager.Manager;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
+import org.asamk.signal.manager.api.MessageEnvelope;

 
 

-import static org.asamk.signal.util.Util.getLegacyIdentifier;
+import java.util.UUID;

 
 record JsonSyncDataMessage(
         @Deprecated String destination,
 
 record JsonSyncDataMessage(
         @Deprecated String destination,


@@ -15,23 +13,16 @@ record JsonSyncDataMessage(
         @JsonUnwrapped JsonDataMessage dataMessage
 ) {
 
         @JsonUnwrapped JsonDataMessage dataMessage
 ) {
 

-    static JsonSyncDataMessage from(SentTranscriptMessage transcriptMessage, Manager m) {
-        if (transcriptMessage.getDestination().isPresent()) {
-            final var address = transcriptMessage.getDestination().get();
-            return new JsonSyncDataMessage(getLegacyIdentifier(address),
-                    address.getNumber().orNull(),
-                    address.getUuid().toString(),
-                    JsonDataMessage.from(transcriptMessage.getMessage(), m));
+    static JsonSyncDataMessage from(MessageEnvelope.Sync.Sent transcriptMessage) {
+        if (transcriptMessage.destination().isPresent()) {
+            final var address = transcriptMessage.destination().get();
+            return new JsonSyncDataMessage(address.getLegacyIdentifier(),
+                    address.number().orElse(null),
+                    address.uuid().map(UUID::toString).orElse(null),
+                    JsonDataMessage.from(transcriptMessage.message()));

 
         } else {
 
         } else {

-            return new JsonSyncDataMessage(null, null, null, JsonDataMessage.from(transcriptMessage.getMessage(), m));
+            return new JsonSyncDataMessage(null, null, null, JsonDataMessage.from(transcriptMessage.message()));

         }
     }
         }
     }

-
-    static JsonSyncDataMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonSyncDataMessage(messageReceived.getDestination(),
-                null,
-                null,
-                JsonDataMessage.from(messageReceived));
-    }

 }
 }