Convert RecipientAddress to record

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

diff --git a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
index b7e1cf2ac600147b74627c2834d3d455fce4f9e1..0c1d0738bfdd2238cc073ba1e1830a12be08dc7d 100644 (file)
--- a/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
+++ b/src/main/java/org/asamk/signal/json/JsonMessageEnvelope.java
@@ -34,14 +34,14 @@ public record JsonMessageEnvelope(
         if (envelope.sourceAddress().isPresent()) {
             final var sourceAddress = envelope.sourceAddress().get();
             source = sourceAddress.getLegacyIdentifier();
         if (envelope.sourceAddress().isPresent()) {
             final var sourceAddress = envelope.sourceAddress().get();
             source = sourceAddress.getLegacyIdentifier();

-            sourceNumber = sourceAddress.getNumber().orElse(null);
-            sourceUuid = sourceAddress.getUuid().map(UUID::toString).orElse(null);
+            sourceNumber = sourceAddress.number().orElse(null);
+            sourceUuid = sourceAddress.uuid().map(UUID::toString).orElse(null);

             sourceDevice = envelope.sourceDevice();
         } else if (exception instanceof UntrustedIdentityException e) {
             final var sender = e.getSender();
             source = sender.getLegacyIdentifier();
             sourceDevice = envelope.sourceDevice();
         } else if (exception instanceof UntrustedIdentityException e) {
             final var sender = e.getSender();
             source = sender.getLegacyIdentifier();

-            sourceNumber = sender.getNumber().orElse(null);
-            sourceUuid = sender.getUuid().map(UUID::toString).orElse(null);
+            sourceNumber = sender.number().orElse(null);
+            sourceUuid = sender.uuid().map(UUID::toString).orElse(null);

             sourceDevice = e.getSenderDevice();
         } else {
             source = null;
             sourceDevice = e.getSenderDevice();
         } else {
             source = null;