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 7eea04729546a40d3f057c53c2f0ba98757d3fc1..fc84b0887ef75bf9e82393a94f8a8144b44facc5 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
+++ b/src/main/java/org/asamk/signal/json/JsonSyncDataMessage.java
@@ -17,12 +17,15 @@ record JsonSyncDataMessage(
         if (transcriptMessage.destination().isPresent()) {
             final var address = transcriptMessage.destination().get();
             return new JsonSyncDataMessage(address.getLegacyIdentifier(),
         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 {
 
         } else {

-            return new JsonSyncDataMessage(null, null, null, JsonDataMessage.from(transcriptMessage.message()));
+            return new JsonSyncDataMessage(null,
+                    null,
+                    null,
+                    transcriptMessage.message().map(JsonDataMessage::from).orElse(null));

         }
     }
 }
         }
     }
 }