Change meaning of -v flag from --version to --verbose

[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 805c32c88a72d684727aee6234a8695552d5fa35..fc84b0887ef75bf9e82393a94f8a8144b44facc5 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -2,7 +2,6 @@ package org.asamk.signal.json;
 
 import com.fasterxml.jackson.annotation.JsonUnwrapped;
 
-import org.asamk.Signal;
 import org.asamk.signal.manager.api.MessageEnvelope;
 
 import java.util.UUID;
@@ -18,19 +17,15 @@ record JsonSyncDataMessage(
         if (transcriptMessage.destination().isPresent()) {
             final var address = transcriptMessage.destination().get();
             return new JsonSyncDataMessage(address.getLegacyIdentifier(),
-                    address.getNumber().orElse(null),
-                    address.getUuid().map(UUID::toString).orElse(null),
-                    JsonDataMessage.from(transcriptMessage.message()));
+                    address.number().orElse(null),
+                    address.uuid().map(UUID::toString).orElse(null),
+                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
 
         } else {
-            return new JsonSyncDataMessage(null, null, null, JsonDataMessage.from(transcriptMessage.message()));
+            return new JsonSyncDataMessage(null,
+                    null,
+                    null,
+                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));
         }
     }
-
-    static JsonSyncDataMessage from(Signal.SyncMessageReceived messageReceived) {
-        return new JsonSyncDataMessage(messageReceived.getDestination(),
-                null,
-                null,
-                JsonDataMessage.from(messageReceived));
-    }
 }