Refactor manager lib package structure

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

diff --git a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
index 6e9e1a94e64baa70b46ed7047d576c74b9cfeea3..faea75dcbe0858b648809f56f117d0a17e6cc6fe 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -1,187 +1,149 @@
 package org.asamk.signal;
 
 import org.asamk.signal.manager.Manager;
 package org.asamk.signal;
 
 import org.asamk.signal.manager.Manager;

-import org.asamk.signal.manager.groups.GroupId;
-import org.asamk.signal.manager.groups.GroupUtils;
-import org.asamk.signal.manager.storage.groups.GroupInfo;
+import org.asamk.signal.manager.api.GroupId;
+import org.asamk.signal.manager.api.MessageEnvelope;
+import org.asamk.signal.manager.api.RecipientAddress;
+import org.asamk.signal.manager.api.RecipientIdentifier;
+import org.asamk.signal.manager.api.TextStyle;
+import org.asamk.signal.manager.api.UntrustedIdentityException;
+import org.asamk.signal.output.PlainTextWriter;

 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.DateUtils;

-import org.asamk.signal.util.Util;
+import org.asamk.signal.util.Hex;

 import org.slf4j.helpers.MessageFormatter;
 import org.slf4j.helpers.MessageFormatter;

-import org.whispersystems.libsignal.UntrustedIdentityException;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachment;
-import org.whispersystems.signalservice.api.messages.SignalServiceAttachmentPointer;
-import org.whispersystems.signalservice.api.messages.SignalServiceContent;
-import org.whispersystems.signalservice.api.messages.SignalServiceDataMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceEnvelope;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroup;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupContext;
-import org.whispersystems.signalservice.api.messages.SignalServiceGroupV2;
-import org.whispersystems.signalservice.api.messages.SignalServiceReceiptMessage;
-import org.whispersystems.signalservice.api.messages.SignalServiceTypingMessage;
-import org.whispersystems.signalservice.api.messages.calls.AnswerMessage;
-import org.whispersystems.signalservice.api.messages.calls.BusyMessage;
-import org.whispersystems.signalservice.api.messages.calls.HangupMessage;
-import org.whispersystems.signalservice.api.messages.calls.IceUpdateMessage;
-import org.whispersystems.signalservice.api.messages.calls.OfferMessage;
-import org.whispersystems.signalservice.api.messages.calls.OpaqueMessage;
-import org.whispersystems.signalservice.api.messages.calls.SignalServiceCallMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.BlockedListMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ConfigurationMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ContactsMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.KeysMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.MessageRequestResponseMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ReadMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SentTranscriptMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.SignalServiceSyncMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.StickerPackOperationMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.VerifiedMessage;
-import org.whispersystems.signalservice.api.messages.multidevice.ViewOnceOpenMessage;
-import org.whispersystems.signalservice.api.messages.shared.SharedContact;
-import org.whispersystems.signalservice.api.push.SignalServiceAddress;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Base64;
-import java.util.List;
+
+import java.util.ArrayList;

 import java.util.stream.Collectors;
 
 public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
     final Manager m;
 import java.util.stream.Collectors;
 
 public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
 
     final Manager m;

+    final PlainTextWriter writer;

 
 

-    public ReceiveMessageHandler(Manager m) {
+    public ReceiveMessageHandler(Manager m, final PlainTextWriter writer) {

         this.m = m;
         this.m = m;

+        this.writer = writer;

     }
 
     @Override
     }
 
     @Override

-    public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
-        try {
-            printMessage(envelope, content, exception);
-        } catch (IOException e) {
-            e.printStackTrace();
+    public void handleMessage(MessageEnvelope envelope, Throwable exception) {
+        synchronized (writer) {
+            handleMessageInternal(envelope, exception);

         }
     }
 
         }
     }
 

-    private void printMessage(
-            SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception
-    ) throws IOException {
-        PlainTextWriter writer = new PlainTextWriterImpl(System.out);
-
-        if (envelope.hasSource()) {
-            SignalServiceAddress source = envelope.getSourceAddress();
-            writer.println("Envelope from: {} (device: {})", formatContact(source), envelope.getSourceDevice());
-            if (source.getRelay().isPresent()) {
-                writer.println("Relayed by: {}", source.getRelay().get());
-            }
-        } else {
-            writer.println("Envelope from: unknown source");
-        }
-        writer.println("Timestamp: {}", DateUtils.formatTimestamp(envelope.getTimestamp()));
+    private void handleMessageInternal(MessageEnvelope envelope, Throwable exception) {
+        var source = envelope.sourceAddress();
+        writer.println("Envelope from: {} (device: {}) to {}",
+                source.map(this::formatContact).orElse("unknown source"),
+                envelope.sourceDevice(),
+                m.getSelfNumber());
+        writer.println("Timestamp: {}", DateUtils.formatTimestamp(envelope.timestamp()));
+        writer.println("Server timestamps: received: {} delivered: {}",
+                DateUtils.formatTimestamp(envelope.serverReceivedTimestamp()),
+                DateUtils.formatTimestamp(envelope.serverDeliveredTimestamp()));

         if (envelope.isUnidentifiedSender()) {
             writer.println("Sent by unidentified/sealed sender");
         }
 
         if (envelope.isUnidentifiedSender()) {
             writer.println("Sent by unidentified/sealed sender");
         }
 

-        if (envelope.isReceipt()) {
-            writer.println("Got receipt.");
-        } else if (envelope.isSignalMessage() || envelope.isPreKeySignalMessage() || envelope.isUnidentifiedSender()) {
-            if (exception != null) {
-                if (exception instanceof UntrustedIdentityException) {
-                    UntrustedIdentityException e = (UntrustedIdentityException) exception;
-                    writer.println(
-                            "The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message.");
-                    writer.println(
-                            "Use 'signal-cli -u {0} listIdentities -n {1}', verify the key and run 'signal-cli -u {0} trust -v \"FINGER_PRINT\" {1}' to mark it as trusted",
-                            m.getUsername(),
-                            e.getName());
-                    writer.println(
-                            "If you don't care about security, use 'signal-cli -u {} trust -a {}' to trust it without verification",
-                            m.getUsername(),
-                            e.getName());
-                } else {
-                    writer.println("Exception: {} ({})", exception.getMessage(), exception.getClass().getSimpleName());
-                }
-            }
-            if (content == null) {
-                writer.println("Failed to decrypt message.");
+        if (exception != null) {
+            if (exception instanceof UntrustedIdentityException e) {
+                writer.println(
+                        "The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message.");
+                final var recipientName = e.getSender().getLegacyIdentifier();
+                writer.println(
+                        "Use 'signal-cli -a {} listIdentities -n {}', verify the key and run 'signal-cli -a {} trust -v \"FINGER_PRINT\" {}' to mark it as trusted",
+                        m.getSelfNumber(),
+                        recipientName,
+                        m.getSelfNumber(),
+                        recipientName);
+                writer.println(
+                        "If you don't care about security, use 'signal-cli -a {} trust -a {}' to trust it without verification",
+                        m.getSelfNumber(),
+                        recipientName);

             } else {
             } else {

-                writer.println("Sender: {} (device: {})",
-                        formatContact(content.getSender()),
-                        content.getSenderDevice());
-                writer.println("Server timestamps: received: {} delivered: {}",
-                        DateUtils.formatTimestamp(content.getServerReceivedTimestamp()),
-                        DateUtils.formatTimestamp(content.getServerDeliveredTimestamp()));
-
-                if (content.getDataMessage().isPresent()) {
-                    SignalServiceDataMessage message = content.getDataMessage().get();
-                    printDataMessage(writer, message);
-                }
-                if (content.getSyncMessage().isPresent()) {
-                    writer.println("Received a sync message");
-                    SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
-                    printSyncMessage(writer, syncMessage);
-                }
-
-                if (content.getCallMessage().isPresent()) {
-                    writer.println("Received a call message");
-                    SignalServiceCallMessage callMessage = content.getCallMessage().get();
-                    printCallMessage(writer.indentedWriter(), callMessage);
-                }
-                if (content.getReceiptMessage().isPresent()) {
-                    writer.println("Received a receipt message");
-                    SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
-                    printReceiptMessage(writer.indentedWriter(), receiptMessage);
-                }
-                if (content.getTypingMessage().isPresent()) {
-                    writer.println("Received a typing message");
-                    SignalServiceTypingMessage typingMessage = content.getTypingMessage().get();
-                    printTypingMessage(writer.indentedWriter(), typingMessage);
-                }
+                writer.println("Exception: {} ({})", exception.getMessage(), exception.getClass().getSimpleName());

             }
             }

-        } else {
-            writer.println("Unknown message received.");
+        }
+
+        if (envelope.data().isPresent()) {
+            var message = envelope.data().get();
+            printDataMessage(writer, message);
+        }
+        if (envelope.edit().isPresent()) {
+            var message = envelope.edit().get();
+            printEditMessage(writer, message);
+        }
+        if (envelope.story().isPresent()) {
+            var message = envelope.story().get();
+            printStoryMessage(writer.indentedWriter(), message);
+        }
+        if (envelope.sync().isPresent()) {
+            writer.println("Received a sync message");
+            var syncMessage = envelope.sync().get();
+            printSyncMessage(writer, syncMessage);
+        }
+        if (envelope.call().isPresent()) {
+            writer.println("Received a call message");
+            var callMessage = envelope.call().get();
+            printCallMessage(writer.indentedWriter(), callMessage);
+        }
+        if (envelope.receipt().isPresent()) {
+            writer.println("Received a receipt message");
+            var receiptMessage = envelope.receipt().get();
+            printReceiptMessage(writer.indentedWriter(), receiptMessage);
+        }
+        if (envelope.typing().isPresent()) {
+            writer.println("Received a typing message");
+            var typingMessage = envelope.typing().get();
+            printTypingMessage(writer.indentedWriter(), typingMessage);

         }
         writer.println();
     }
 
     private void printDataMessage(
         }
         writer.println();
     }
 
     private void printDataMessage(

-            PlainTextWriter writer, SignalServiceDataMessage message
-    ) throws IOException {
-        writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.getTimestamp()));
+            PlainTextWriter writer, MessageEnvelope.Data message
+    ) {
+        writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.timestamp()));

         if (message.isViewOnce()) {
             writer.println("=VIEW ONCE=");
         }
 
         if (message.isViewOnce()) {
             writer.println("=VIEW ONCE=");
         }
 

-        if (message.getBody().isPresent()) {
-            writer.println("Body: {}", message.getBody().get());
+        if (message.body().isPresent()) {
+            writer.println("Body: {}", message.body().get());

         }
         }

-        if (message.getGroupContext().isPresent()) {
+        if (message.groupContext().isPresent()) {

             writer.println("Group info:");
             writer.println("Group info:");

-            final SignalServiceGroupContext groupContext = message.getGroupContext().get();
+            final var groupContext = message.groupContext().get();

             printGroupContext(writer.indentedWriter(), groupContext);
         }
             printGroupContext(writer.indentedWriter(), groupContext);
         }

-        if (message.getGroupCallUpdate().isPresent()) {
+        if (message.storyContext().isPresent()) {
+            writer.println("Story reply:");
+            final var storyContext = message.storyContext().get();
+            printStoryContext(writer.indentedWriter(), storyContext);
+        }
+        if (message.groupCallUpdate().isPresent()) {

             writer.println("Group call update:");
             writer.println("Group call update:");

-            final SignalServiceDataMessage.GroupCallUpdate groupCallUpdate = message.getGroupCallUpdate().get();
-            writer.indentedWriter().println("Era id: {}", groupCallUpdate.getEraId());
+            final var groupCallUpdate = message.groupCallUpdate().get();
+            writer.indentedWriter().println("Era id: {}", groupCallUpdate.eraId());

         }
         }

-        if (message.getPreviews().isPresent()) {
+        if (message.previews().size() > 0) {

             writer.println("Previews:");
             writer.println("Previews:");

-            final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
-            for (SignalServiceDataMessage.Preview preview : previews) {
+            final var previews = message.previews();
+            for (var preview : previews) {

                 writer.println("- Preview");
                 printPreview(writer.indentedWriter(), preview);
             }
         }
                 writer.println("- Preview");
                 printPreview(writer.indentedWriter(), preview);
             }
         }

-        if (message.getSharedContacts().isPresent()) {
-            final List<SharedContact> sharedContacts = message.getSharedContacts().get();
+        if (message.sharedContacts().size() > 0) {

             writer.println("Contacts:");
             writer.println("Contacts:");

-            for (SharedContact contact : sharedContacts) {
+            for (var contact : message.sharedContacts()) {

                 writer.println("- Contact:");
                 printSharedContact(writer.indentedWriter(), contact);
             }
         }
                 writer.println("- Contact:");
                 printSharedContact(writer.indentedWriter(), contact);
             }
         }

-        if (message.getSticker().isPresent()) {
-            final SignalServiceDataMessage.Sticker sticker = message.getSticker().get();
+        if (message.sticker().isPresent()) {
+            final var sticker = message.sticker().get();

             writer.println("Sticker:");
             printSticker(writer.indentedWriter(), sticker);
         }
             writer.println("Sticker:");
             printSticker(writer.indentedWriter(), sticker);
         }


@@ -189,156 +151,192 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             writer.println("Is end session");
         }
         if (message.isExpirationUpdate()) {
             writer.println("Is end session");
         }
         if (message.isExpirationUpdate()) {

-            writer.println("Is Expiration update: {}", message.isExpirationUpdate());
+            writer.println("Is Expiration update: true");
+        }
+        if (message.expiresInSeconds() > 0) {
+            writer.println("Expires in: {} seconds", message.expiresInSeconds());

         }
         }

-        if (message.getExpiresInSeconds() > 0) {
-            writer.println("Expires in: {} seconds", message.getExpiresInSeconds());
+        if (message.isProfileKeyUpdate()) {
+            writer.println("Profile key update");

         }
         }

-        if (message.getProfileKey().isPresent()) {
-            writer.println("Profile key update, key length: {}", message.getProfileKey().get().length);
+        if (message.hasProfileKey()) {
+            writer.println("With profile key");

         }
         }

-        if (message.getReaction().isPresent()) {
+        if (message.reaction().isPresent()) {

             writer.println("Reaction:");
             writer.println("Reaction:");

-            final SignalServiceDataMessage.Reaction reaction = message.getReaction().get();
+            final var reaction = message.reaction().get();

             printReaction(writer.indentedWriter(), reaction);
         }
             printReaction(writer.indentedWriter(), reaction);
         }

-        if (message.getQuote().isPresent()) {
+        if (message.quote().isPresent()) {

             writer.println("Quote:");
             writer.println("Quote:");

-            SignalServiceDataMessage.Quote quote = message.getQuote().get();
+            var quote = message.quote().get();

             printQuote(writer.indentedWriter(), quote);
         }
             printQuote(writer.indentedWriter(), quote);
         }

-        if (message.getRemoteDelete().isPresent()) {
-            final SignalServiceDataMessage.RemoteDelete remoteDelete = message.getRemoteDelete().get();
-            writer.println("Remote delete message: timestamp = {}", remoteDelete.getTargetSentTimestamp());
+        if (message.remoteDeleteId().isPresent()) {
+            final var remoteDelete = message.remoteDeleteId().get();
+            writer.println("Remote delete message: timestamp = {}", remoteDelete);

         }
         }

-        if (message.getMentions().isPresent()) {
+        if (message.mentions().size() > 0) {

             writer.println("Mentions:");
             writer.println("Mentions:");

-            for (SignalServiceDataMessage.Mention mention : message.getMentions().get()) {
+            for (var mention : message.mentions()) {

                 printMention(writer, mention);
             }
         }
                 printMention(writer, mention);
             }
         }

-        if (message.getAttachments().isPresent()) {
+        if (message.textStyles().size() > 0) {
+            writer.println("Text styles:");
+            for (var textStyle : message.textStyles()) {
+                printTextStyle(writer, textStyle);
+            }
+        }
+        if (message.attachments().size() > 0) {

             writer.println("Attachments:");
             writer.println("Attachments:");

-            for (SignalServiceAttachment attachment : message.getAttachments().get()) {
+            for (var attachment : message.attachments()) {

                 writer.println("- Attachment:");
                 printAttachment(writer.indentedWriter(), attachment);
             }
         }
     }
 
                 writer.println("- Attachment:");
                 printAttachment(writer.indentedWriter(), attachment);
             }
         }
     }
 

+    private void printEditMessage(
+            PlainTextWriter writer, MessageEnvelope.Edit message
+    ) {
+        writer.println("Edit: Target message timestamp: {}", DateUtils.formatTimestamp(message.targetSentTimestamp()));
+        printDataMessage(writer.indentedWriter(), message.dataMessage());
+    }
+
+    private void printStoryMessage(
+            PlainTextWriter writer, MessageEnvelope.Story message
+    ) {
+        writer.println("Story: with replies: {}", message.allowsReplies());
+        if (message.groupId().isPresent()) {
+            writer.println("Group info:");
+            printGroupInfo(writer.indentedWriter(), message.groupId().get());
+        }
+        if (message.textAttachment().isPresent()) {
+            writer.println("Body: {}", message.textAttachment().get().text().orElse(""));
+
+            if (message.textAttachment().get().preview().isPresent()) {
+                writer.println("Preview:");
+                printPreview(writer.indentedWriter(), message.textAttachment().get().preview().get());
+            }
+        }
+        if (message.fileAttachment().isPresent()) {
+            writer.println("Attachments:");
+            printAttachment(writer.indentedWriter(), message.fileAttachment().get());
+        }
+    }
+

     private void printTypingMessage(
     private void printTypingMessage(

-            final PlainTextWriter writer, final SignalServiceTypingMessage typingMessage
-    ) throws IOException {
-        writer.println("Action: {}", typingMessage.getAction());
-        writer.println("Timestamp: {}", DateUtils.formatTimestamp(typingMessage.getTimestamp()));
-        if (typingMessage.getGroupId().isPresent()) {
+            final PlainTextWriter writer, final MessageEnvelope.Typing typingMessage
+    ) {
+        writer.println("Action: {}", typingMessage.type());
+        writer.println("Timestamp: {}", DateUtils.formatTimestamp(typingMessage.timestamp()));
+        if (typingMessage.groupId().isPresent()) {

             writer.println("Group Info:");
             writer.println("Group Info:");

-            final GroupId groupId = GroupId.unknownVersion(typingMessage.getGroupId().get());
+            final var groupId = typingMessage.groupId().get();

             printGroupInfo(writer.indentedWriter(), groupId);
         }
     }
 
     private void printReceiptMessage(
             printGroupInfo(writer.indentedWriter(), groupId);
         }
     }
 
     private void printReceiptMessage(

-            final PlainTextWriter writer, final SignalServiceReceiptMessage receiptMessage
-    ) throws IOException {
-        writer.println("When: {}", DateUtils.formatTimestamp(receiptMessage.getWhen()));
-        if (receiptMessage.isDeliveryReceipt()) {
+            final PlainTextWriter writer, final MessageEnvelope.Receipt receiptMessage
+    ) {
+        writer.println("When: {}", DateUtils.formatTimestamp(receiptMessage.when()));
+        if (receiptMessage.type() == MessageEnvelope.Receipt.Type.DELIVERY) {

             writer.println("Is delivery receipt");
         }
             writer.println("Is delivery receipt");
         }

-        if (receiptMessage.isReadReceipt()) {
+        if (receiptMessage.type() == MessageEnvelope.Receipt.Type.READ) {

             writer.println("Is read receipt");
         }
             writer.println("Is read receipt");
         }

-        if (receiptMessage.isViewedReceipt()) {
+        if (receiptMessage.type() == MessageEnvelope.Receipt.Type.VIEWED) {

             writer.println("Is viewed receipt");
         }
         writer.println("Timestamps:");
             writer.println("Is viewed receipt");
         }
         writer.println("Timestamps:");

-        for (long timestamp : receiptMessage.getTimestamps()) {
+        for (long timestamp : receiptMessage.timestamps()) {

             writer.println("- {}", DateUtils.formatTimestamp(timestamp));
         }
     }
 
     private void printCallMessage(
             writer.println("- {}", DateUtils.formatTimestamp(timestamp));
         }
     }
 
     private void printCallMessage(

-            final PlainTextWriter writer, final SignalServiceCallMessage callMessage
-    ) throws IOException {
-        if (callMessage.getDestinationDeviceId().isPresent()) {
-            final Integer deviceId = callMessage.getDestinationDeviceId().get();
+            final PlainTextWriter writer, final MessageEnvelope.Call callMessage
+    ) {
+        if (callMessage.destinationDeviceId().isPresent()) {
+            final var deviceId = callMessage.destinationDeviceId().get();

             writer.println("Destination device id: {}", deviceId);
         }
             writer.println("Destination device id: {}", deviceId);
         }

-        if (callMessage.getAnswerMessage().isPresent()) {
-            AnswerMessage answerMessage = callMessage.getAnswerMessage().get();
-            writer.println("Answer message: {}, sdp: {})", answerMessage.getId(), answerMessage.getSdp());
+        if (callMessage.groupId().isPresent()) {
+            final var groupId = callMessage.groupId().get();
+            writer.println("Destination group id: {}", groupId);

         }
         }

-        if (callMessage.getBusyMessage().isPresent()) {
-            BusyMessage busyMessage = callMessage.getBusyMessage().get();
-            writer.println("Busy message: {}", busyMessage.getId());
+        if (callMessage.timestamp().isPresent()) {
+            writer.println("Timestamp: {}", DateUtils.formatTimestamp(callMessage.timestamp().get()));

         }
         }

-        if (callMessage.getHangupMessage().isPresent()) {
-            HangupMessage hangupMessage = callMessage.getHangupMessage().get();
-            writer.println("Hangup message: {}", hangupMessage.getId());
+        if (callMessage.answer().isPresent()) {
+            var answerMessage = callMessage.answer().get();
+            writer.println("Answer message: {}, sdp: {})", answerMessage.id(), answerMessage.sdp());

         }
         }

-        if (callMessage.getIceUpdateMessages().isPresent()) {
+        if (callMessage.busy().isPresent()) {
+            var busyMessage = callMessage.busy().get();
+            writer.println("Busy message: {}", busyMessage.id());
+        }
+        if (callMessage.hangup().isPresent()) {
+            var hangupMessage = callMessage.hangup().get();
+            writer.println("Hangup message: {}", hangupMessage.id());
+        }
+        if (callMessage.iceUpdate().size() > 0) {

             writer.println("Ice update messages:");
             writer.println("Ice update messages:");

-            List<IceUpdateMessage> iceUpdateMessages = callMessage.getIceUpdateMessages().get();
-            for (IceUpdateMessage iceUpdateMessage : iceUpdateMessages) {
-                writer.println("- {}, sdp: {}", iceUpdateMessage.getId(), iceUpdateMessage.getSdp());
+            var iceUpdateMessages = callMessage.iceUpdate();
+            for (var iceUpdateMessage : iceUpdateMessages) {
+                writer.println("- {}, sdp: {}", iceUpdateMessage.id(), iceUpdateMessage.sdp());

             }
         }
             }
         }

-        if (callMessage.getOfferMessage().isPresent()) {
-            OfferMessage offerMessage = callMessage.getOfferMessage().get();
-            writer.println("Offer message: {}, sdp: {}", offerMessage.getId(), offerMessage.getSdp());
+        if (callMessage.offer().isPresent()) {
+            var offerMessage = callMessage.offer().get();
+            writer.println("Offer message: {}, sdp: {}", offerMessage.id(), offerMessage.sdp());

         }
         }

-        if (callMessage.getOpaqueMessage().isPresent()) {
-            final OpaqueMessage opaqueMessage = callMessage.getOpaqueMessage().get();
-            writer.println("Opaque message: size {}", opaqueMessage.getOpaque().length);
+        if (callMessage.opaque().isPresent()) {
+            final var opaqueMessage = callMessage.opaque().get();
+            writer.println("Opaque message: size {}, urgency: {}",
+                    opaqueMessage.opaque().length,
+                    opaqueMessage.urgency().name());

         }
     }
 
     private void printSyncMessage(
         }
     }
 
     private void printSyncMessage(

-            final PlainTextWriter writer, final SignalServiceSyncMessage syncMessage
-    ) throws IOException {
-        if (syncMessage.getContacts().isPresent()) {
-            final ContactsMessage contactsMessage = syncMessage.getContacts().get();
-            String type = contactsMessage.isComplete() ? "complete" : "partial";
+            final PlainTextWriter writer, final MessageEnvelope.Sync syncMessage
+    ) {
+        if (syncMessage.contacts().isPresent()) {
+            final var contactsMessage = syncMessage.contacts().get();
+            var type = contactsMessage.isComplete() ? "complete" : "partial";

             writer.println("Received {} sync contacts:", type);
             writer.println("Received {} sync contacts:", type);

-            printAttachment(writer.indentedWriter(), contactsMessage.getContactsStream());

         }
         }

-        if (syncMessage.getGroups().isPresent()) {
-            writer.println("Received sync groups:");
-            printAttachment(writer.indentedWriter(), syncMessage.getGroups().get());
+        if (syncMessage.groups().isPresent()) {
+            writer.println("Received sync groups.");

         }
         }

-        if (syncMessage.getRead().isPresent()) {
+        if (syncMessage.read().size() > 0) {

             writer.println("Received sync read messages list");
             writer.println("Received sync read messages list");

-            for (ReadMessage rm : syncMessage.getRead().get()) {
+            for (var rm : syncMessage.read()) {

                 writer.println("- From: {} Message timestamp: {}",
                 writer.println("- From: {} Message timestamp: {}",

-                        formatContact(rm.getSender()),
-                        DateUtils.formatTimestamp(rm.getTimestamp()));
+                        formatContact(rm.sender()),
+                        DateUtils.formatTimestamp(rm.timestamp()));

             }
         }
             }
         }

-        if (syncMessage.getRequest().isPresent()) {
-            String type;
-            if (syncMessage.getRequest().get().isContactsRequest()) {
-                type = "contacts";
-            } else if (syncMessage.getRequest().get().isGroupsRequest()) {
-                type = "groups";
-            } else if (syncMessage.getRequest().get().isBlockedListRequest()) {
-                type = "blocked list";
-            } else if (syncMessage.getRequest().get().isConfigurationRequest()) {
-                type = "configuration";
-            } else if (syncMessage.getRequest().get().isKeysRequest()) {
-                type = "keys";
-            } else {
-                type = "<unknown>";
+        if (syncMessage.viewed().size() > 0) {
+            writer.println("Received sync viewed messages list");
+            for (var vm : syncMessage.viewed()) {
+                writer.println("- From: {} Message timestamp: {}",
+                        formatContact(vm.sender()),
+                        DateUtils.formatTimestamp(vm.timestamp()));

             }
             }

-            writer.println("Received sync request for: {}", type);

         }
         }

-        if (syncMessage.getSent().isPresent()) {
+        if (syncMessage.sent().isPresent()) {

             writer.println("Received sync sent message");
             writer.println("Received sync sent message");

-            final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
+            final var sentTranscriptMessage = syncMessage.sent().get();

             String to;
             String to;

-            if (sentTranscriptMessage.getDestination().isPresent()) {
-                to = formatContact(sentTranscriptMessage.getDestination().get());
-            } else if (sentTranscriptMessage.getRecipients().size() > 0) {
-                to = sentTranscriptMessage.getRecipients()
+            if (sentTranscriptMessage.destination().isPresent()) {
+                to = formatContact(sentTranscriptMessage.destination().get());
+            } else if (sentTranscriptMessage.recipients().size() > 0) {
+                to = sentTranscriptMessage.recipients()

                         .stream()
                         .map(this::formatContact)
                         .collect(Collectors.joining(", "));
                         .stream()
                         .map(this::formatContact)
                         .collect(Collectors.joining(", "));


@@ -347,261 +345,196 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
             writer.indentedWriter().println("To: {}", to);
             writer.indentedWriter()
             }
             writer.indentedWriter().println("To: {}", to);
             writer.indentedWriter()

-                    .println("Timestamp: {}", DateUtils.formatTimestamp(sentTranscriptMessage.getTimestamp()));
-            if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) {
+                    .println("Timestamp: {}", DateUtils.formatTimestamp(sentTranscriptMessage.timestamp()));
+            if (sentTranscriptMessage.expirationStartTimestamp() > 0) {

                 writer.indentedWriter()
                         .println("Expiration started at: {}",
                 writer.indentedWriter()
                         .println("Expiration started at: {}",

-                                DateUtils.formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
+                                DateUtils.formatTimestamp(sentTranscriptMessage.expirationStartTimestamp()));
+            }
+            if (sentTranscriptMessage.message().isPresent()) {
+                var message = sentTranscriptMessage.message().get();
+                printDataMessage(writer.indentedWriter(), message);
+            }
+            if (sentTranscriptMessage.story().isPresent()) {
+                var message = sentTranscriptMessage.story().get();
+                printStoryMessage(writer.indentedWriter(), message);

             }
             }

-            SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
-            printDataMessage(writer.indentedWriter(), message);

         }
         }

-        if (syncMessage.getBlockedList().isPresent()) {
+        if (syncMessage.blocked().isPresent()) {

             writer.println("Received sync message with block list");
             writer.println("Received sync message with block list");

-            writer.println("Blocked numbers:");
-            final BlockedListMessage blockedList = syncMessage.getBlockedList().get();
-            for (SignalServiceAddress address : blockedList.getAddresses()) {
+            writer.println("Blocked:");
+            final var blockedList = syncMessage.blocked().get();
+            for (var address : blockedList.recipients()) {

                 writer.println("- {}", address.getLegacyIdentifier());
             }
                 writer.println("- {}", address.getLegacyIdentifier());
             }

-        }
-        if (syncMessage.getVerified().isPresent()) {
-            writer.println("Received sync message with verified identities:");
-            final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
-            writer.println("- {}: {}", formatContact(verifiedMessage.getDestination()), verifiedMessage.getVerified());
-            String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination(),
-                    verifiedMessage.getIdentityKey()));
-            writer.indentedWriter().println(safetyNumber);
-        }
-        if (syncMessage.getConfiguration().isPresent()) {
-            writer.println("Received sync message with configuration:");
-            final ConfigurationMessage configurationMessage = syncMessage.getConfiguration().get();
-            if (configurationMessage.getReadReceipts().isPresent()) {
-                writer.println("- Read receipts: {}",
-                        configurationMessage.getReadReceipts().get() ? "enabled" : "disabled");
-            }
-            if (configurationMessage.getLinkPreviews().isPresent()) {
-                writer.println("- Link previews: {}",
-                        configurationMessage.getLinkPreviews().get() ? "enabled" : "disabled");
-            }
-            if (configurationMessage.getTypingIndicators().isPresent()) {
-                writer.println("- Typing indicators: {}",
-                        configurationMessage.getTypingIndicators().get() ? "enabled" : "disabled");
+            for (var groupId : blockedList.groupIds()) {
+                writer.println("- {}", groupId.toBase64());

             }
             }

-            if (configurationMessage.getUnidentifiedDeliveryIndicators().isPresent()) {
-                writer.println("- Unidentified Delivery Indicators: {}",
-                        configurationMessage.getUnidentifiedDeliveryIndicators().get() ? "enabled" : "disabled");
-            }
-        }
-        if (syncMessage.getFetchType().isPresent()) {
-            final SignalServiceSyncMessage.FetchType fetchType = syncMessage.getFetchType().get();
-            writer.println("Received sync message with fetch type: {}", fetchType);

         }
         }

-        if (syncMessage.getViewOnceOpen().isPresent()) {
-            final ViewOnceOpenMessage viewOnceOpenMessage = syncMessage.getViewOnceOpen().get();
+        if (syncMessage.viewOnceOpen().isPresent()) {
+            final var viewOnceOpenMessage = syncMessage.viewOnceOpen().get();

             writer.println("Received sync message with view once open message:");
             writer.println("Received sync message with view once open message:");

-            writer.indentedWriter().println("Sender: {}", formatContact(viewOnceOpenMessage.getSender()));
+            writer.indentedWriter().println("Sender: {}", formatContact(viewOnceOpenMessage.sender()));

             writer.indentedWriter()
             writer.indentedWriter()

-                    .println("Timestamp: {}", DateUtils.formatTimestamp(viewOnceOpenMessage.getTimestamp()));
-        }
-        if (syncMessage.getStickerPackOperations().isPresent()) {
-            final List<StickerPackOperationMessage> stickerPackOperationMessages = syncMessage.getStickerPackOperations()
-                    .get();
-            writer.println("Received sync message with sticker pack operations:");
-            for (StickerPackOperationMessage m : stickerPackOperationMessages) {
-                writer.println("- {}", m.getType().isPresent() ? m.getType().get() : "<unknown>");
-                if (m.getPackId().isPresent()) {
-                    writer.indentedWriter()
-                            .println("packId: {}", Base64.getEncoder().encodeToString(m.getPackId().get()));
-                }
-                if (m.getPackKey().isPresent()) {
-                    writer.indentedWriter()
-                            .println("packKey: {}", Base64.getEncoder().encodeToString(m.getPackKey().get()));
-                }
-            }
+                    .println("Timestamp: {}", DateUtils.formatTimestamp(viewOnceOpenMessage.timestamp()));

         }
         }

-        if (syncMessage.getMessageRequestResponse().isPresent()) {
-            final MessageRequestResponseMessage requestResponseMessage = syncMessage.getMessageRequestResponse().get();
+        if (syncMessage.messageRequestResponse().isPresent()) {
+            final var requestResponseMessage = syncMessage.messageRequestResponse().get();

             writer.println("Received message request response:");
             writer.println("Received message request response:");

-            writer.indentedWriter().println("Type: {}", requestResponseMessage.getType());
-            if (requestResponseMessage.getGroupId().isPresent()) {
+            writer.indentedWriter().println("Type: {}", requestResponseMessage.type());
+            if (requestResponseMessage.groupId().isPresent()) {

                 writer.println("For group:");
                 writer.println("For group:");

-                printGroupInfo(writer.indentedWriter(),
-                        GroupId.unknownVersion(requestResponseMessage.getGroupId().get()));
-            }
-            if (requestResponseMessage.getPerson().isPresent()) {
-                writer.indentedWriter()
-                        .println("For Person: {}", formatContact(requestResponseMessage.getPerson().get()));
+                printGroupInfo(writer.indentedWriter(), requestResponseMessage.groupId().get());

             }
             }

-        }
-        if (syncMessage.getKeys().isPresent()) {
-            final KeysMessage keysMessage = syncMessage.getKeys().get();
-            writer.println("Received sync message with keys:");
-            if (keysMessage.getStorageService().isPresent()) {
-                writer.println("-  storage key: length: {}", keysMessage.getStorageService().get().serialize().length);
+            if (requestResponseMessage.person().isPresent()) {
+                writer.indentedWriter().println("For Person: {}", formatContact(requestResponseMessage.person().get()));

             }
         }
     }
 
     private void printPreview(
             }
         }
     }
 
     private void printPreview(

-            final PlainTextWriter writer, final SignalServiceDataMessage.Preview preview
-    ) throws IOException {
-        writer.println("Title: {}", preview.getTitle());
-        writer.println("Description: {}", preview.getDescription());
-        writer.println("Date: {}", DateUtils.formatTimestamp(preview.getDate()));
-        writer.println("Url: {}", preview.getUrl());
-        if (preview.getImage().isPresent()) {
+            final PlainTextWriter writer, final MessageEnvelope.Data.Preview preview
+    ) {
+        writer.println("Title: {}", preview.title());
+        writer.println("Description: {}", preview.description());
+        writer.println("Date: {}", DateUtils.formatTimestamp(preview.date()));
+        writer.println("Url: {}", preview.url());
+        if (preview.image().isPresent()) {

             writer.println("Image:");
             writer.println("Image:");

-            printAttachment(writer.indentedWriter(), preview.getImage().get());
+            printAttachment(writer.indentedWriter(), preview.image().get());

         }
     }
 
     private void printSticker(
         }
     }
 
     private void printSticker(

-            final PlainTextWriter writer, final SignalServiceDataMessage.Sticker sticker
-    ) throws IOException {
-        writer.println("Pack id: {}", Base64.getEncoder().encodeToString(sticker.getPackId()));
-        writer.println("Pack key: {}", Base64.getEncoder().encodeToString(sticker.getPackKey()));
-        writer.println("Sticker id: {}", sticker.getStickerId());
-        writer.println("Image:");
-        printAttachment(writer.indentedWriter(), sticker.getAttachment());
+            final PlainTextWriter writer, final MessageEnvelope.Data.Sticker sticker
+    ) {
+        writer.println("Pack id: {}", Hex.toStringCondensed(sticker.packId().serialize()));
+        writer.println("Sticker id: {}", sticker.stickerId());

     }
 
     private void printReaction(
     }
 
     private void printReaction(

-            final PlainTextWriter writer, final SignalServiceDataMessage.Reaction reaction
-    ) throws IOException {
-        writer.println("Emoji: {}", reaction.getEmoji());
-        writer.println("Target author: {}", formatContact(m.resolveSignalServiceAddress(reaction.getTargetAuthor())));
-        writer.println("Target timestamp: {}", DateUtils.formatTimestamp(reaction.getTargetSentTimestamp()));
+            final PlainTextWriter writer, final MessageEnvelope.Data.Reaction reaction
+    ) {
+        writer.println("Emoji: {}", reaction.emoji());
+        writer.println("Target author: {}", formatContact(reaction.targetAuthor()));
+        writer.println("Target timestamp: {}", DateUtils.formatTimestamp(reaction.targetSentTimestamp()));

         writer.println("Is remove: {}", reaction.isRemove());
     }
 
     private void printQuote(
         writer.println("Is remove: {}", reaction.isRemove());
     }
 
     private void printQuote(

-            final PlainTextWriter writer, final SignalServiceDataMessage.Quote quote
-    ) throws IOException {
-        writer.println("Id: {}", quote.getId());
-        writer.println("Author: {}", m.resolveSignalServiceAddress(quote.getAuthor()).getLegacyIdentifier());
-        writer.println("Text: {}", quote.getText());
-        if (quote.getMentions() != null && quote.getMentions().size() > 0) {
+            final PlainTextWriter writer, final MessageEnvelope.Data.Quote quote
+    ) {
+        writer.println("Id: {}", quote.id());
+        writer.println("Author: {}", formatContact(quote.author()));
+        if (quote.text().isPresent()) {
+            writer.println("Text: {}", quote.text().get());
+        }
+        if (quote.mentions() != null && quote.mentions().size() > 0) {

             writer.println("Mentions:");
             writer.println("Mentions:");

-            for (SignalServiceDataMessage.Mention mention : quote.getMentions()) {
+            for (var mention : quote.mentions()) {

                 printMention(writer, mention);
             }
         }
                 printMention(writer, mention);
             }
         }

-        if (quote.getAttachments().size() > 0) {
+        if (quote.attachments().size() > 0) {

             writer.println("Attachments:");
             writer.println("Attachments:");

-            for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
-                writer.println("- Filename: {}", attachment.getFileName());
-                writer.indent(w -> {
-                    w.println("Type: {}", attachment.getContentType());
-                    w.println("Thumbnail:");
-                    if (attachment.getThumbnail() != null) {
-                        printAttachment(w, attachment.getThumbnail());
-                    }
-                });
+            for (var attachment : quote.attachments()) {
+                writer.println("- Attachment:");
+                printAttachment(writer.indentedWriter(), attachment);

             }
         }
     }
 
             }
         }
     }
 

-    private void printSharedContact(final PlainTextWriter writer, final SharedContact contact) throws IOException {
+    private void printSharedContact(final PlainTextWriter writer, final MessageEnvelope.Data.SharedContact contact) {

         writer.println("Name:");
         writer.println("Name:");

-        SharedContact.Name name = contact.getName();
+        var name = contact.name();

         writer.indent(w -> {
         writer.indent(w -> {

-            if (name.getDisplay().isPresent() && !name.getDisplay().get().isBlank()) {
-                w.println("Display name: {}", name.getDisplay().get());
+            if (name.display().isPresent() && !name.display().get().isBlank()) {
+                w.println("Display name: {}", name.display().get());

             }
             }

-            if (name.getGiven().isPresent() && !name.getGiven().get().isBlank()) {
-                w.println("First name: {}", name.getGiven().get());
+            if (name.given().isPresent() && !name.given().get().isBlank()) {
+                w.println("First name: {}", name.given().get());

             }
             }

-            if (name.getMiddle().isPresent() && !name.getMiddle().get().isBlank()) {
-                w.println("Middle name: {}", name.getMiddle().get());
+            if (name.middle().isPresent() && !name.middle().get().isBlank()) {
+                w.println("Middle name: {}", name.middle().get());

             }
             }

-            if (name.getFamily().isPresent() && !name.getFamily().get().isBlank()) {
-                w.println("Family name: {}", name.getFamily().get());
+            if (name.family().isPresent() && !name.family().get().isBlank()) {
+                w.println("Family name: {}", name.family().get());

             }
             }

-            if (name.getPrefix().isPresent() && !name.getPrefix().get().isBlank()) {
-                w.println("Prefix name: {}", name.getPrefix().get());
+            if (name.prefix().isPresent() && !name.prefix().get().isBlank()) {
+                w.println("Prefix name: {}", name.prefix().get());

             }
             }

-            if (name.getSuffix().isPresent() && !name.getSuffix().get().isBlank()) {
-                w.println("Suffix name: {}", name.getSuffix().get());
+            if (name.suffix().isPresent() && !name.suffix().get().isBlank()) {
+                w.println("Suffix name: {}", name.suffix().get());

             }
         });
 
             }
         });
 

-        if (contact.getAvatar().isPresent()) {
-            SharedContact.Avatar avatar = contact.getAvatar().get();
+        if (contact.avatar().isPresent()) {
+            var avatar = contact.avatar().get();

             writer.println("Avatar: (profile: {})", avatar.isProfile());
             writer.println("Avatar: (profile: {})", avatar.isProfile());

-            printAttachment(writer.indentedWriter(), avatar.getAttachment());
+            printAttachment(writer.indentedWriter(), avatar.attachment());

         }
 
         }
 

-        if (contact.getOrganization().isPresent()) {
-            writer.println("Organisation: {}", contact.getOrganization().get());
+        if (contact.organization().isPresent()) {
+            writer.println("Organisation: {}", contact.organization().get());

         }
 
         }
 

-        if (contact.getPhone().isPresent()) {
+        if (contact.phone().size() > 0) {

             writer.println("Phone details:");
             writer.println("Phone details:");

-            for (SharedContact.Phone phone : contact.getPhone().get()) {
+            for (var phone : contact.phone()) {

                 writer.println("- Phone:");
                 writer.indent(w -> {
                 writer.println("- Phone:");
                 writer.indent(w -> {

-                    if (phone.getValue() != null) {
-                        w.println("Number: {}", phone.getValue());
-                    }
-                    if (phone.getType() != null) {
-                        w.println("Type: {}", phone.getType());
-                    }
-                    if (phone.getLabel().isPresent() && !phone.getLabel().get().isBlank()) {
-                        w.println("Label: {}", phone.getLabel().get());
+                    w.println("Number: {}", phone.value());
+                    w.println("Type: {}", phone.type());
+                    if (phone.label().isPresent() && !phone.label().get().isBlank()) {
+                        w.println("Label: {}", phone.label().get());

                     }
                 });
             }
         }
 
                     }
                 });
             }
         }
 

-        if (contact.getEmail().isPresent()) {
+        if (contact.email().size() > 0) {

             writer.println("Email details:");
             writer.println("Email details:");

-            for (SharedContact.Email email : contact.getEmail().get()) {
+            for (var email : contact.email()) {

                 writer.println("- Email:");
                 writer.indent(w -> {
                 writer.println("- Email:");
                 writer.indent(w -> {

-                    if (email.getValue() != null) {
-                        w.println("Address: {}", email.getValue());
-                    }
-                    if (email.getType() != null) {
-                        w.println("Type: {}", email.getType());
-                    }
-                    if (email.getLabel().isPresent() && !email.getLabel().get().isBlank()) {
-                        w.println("Label: {}", email.getLabel().get());
+                    w.println("Address: {}", email.value());
+                    w.println("Type: {}", email.type());
+                    if (email.label().isPresent() && !email.label().get().isBlank()) {
+                        w.println("Label: {}", email.label().get());

                     }
                 });
             }
         }
 
                     }
                 });
             }
         }
 

-        if (contact.getAddress().isPresent()) {
+        if (contact.address().size() > 0) {

             writer.println("Address details:");
             writer.println("Address details:");

-            for (SharedContact.PostalAddress address : contact.getAddress().get()) {
+            for (var address : contact.address()) {

                 writer.println("- Address:");
                 writer.indent(w -> {
                 writer.println("- Address:");
                 writer.indent(w -> {

-                    if (address.getType() != null) {
-                        w.println("Type: {}", address.getType());
+                    w.println("Type: {}", address.type());
+                    if (address.label().isPresent() && !address.label().get().isBlank()) {
+                        w.println("Label: {}", address.label().get());

                     }
                     }

-                    if (address.getLabel().isPresent() && !address.getLabel().get().isBlank()) {
-                        w.println("Label: {}", address.getLabel().get());
+                    if (address.street().isPresent() && !address.street().get().isBlank()) {
+                        w.println("Street: {}", address.street().get());

                     }
                     }

-                    if (address.getStreet().isPresent() && !address.getStreet().get().isBlank()) {
-                        w.println("Street: {}", address.getStreet().get());
+                    if (address.pobox().isPresent() && !address.pobox().get().isBlank()) {
+                        w.println("Pobox: {}", address.pobox().get());

                     }
                     }

-                    if (address.getPobox().isPresent() && !address.getPobox().get().isBlank()) {
-                        w.println("Pobox: {}", address.getPobox().get());
+                    if (address.neighborhood().isPresent() && !address.neighborhood().get().isBlank()) {
+                        w.println("Neighbourhood: {}", address.neighborhood().get());

                     }
                     }

-                    if (address.getNeighborhood().isPresent() && !address.getNeighborhood().get().isBlank()) {
-                        w.println("Neighbourhood: {}", address.getNeighborhood().get());
+                    if (address.city().isPresent() && !address.city().get().isBlank()) {
+                        w.println("City: {}", address.city().get());

                     }
                     }

-                    if (address.getCity().isPresent() && !address.getCity().get().isBlank()) {
-                        w.println("City: {}", address.getCity().get());
+                    if (address.region().isPresent() && !address.region().get().isBlank()) {
+                        w.println("Region: {}", address.region().get());

                     }
                     }

-                    if (address.getRegion().isPresent() && !address.getRegion().get().isBlank()) {
-                        w.println("Region: {}", address.getRegion().get());
+                    if (address.postcode().isPresent() && !address.postcode().get().isBlank()) {
+                        w.println("Postcode: {}", address.postcode().get());

                     }
                     }

-                    if (address.getPostcode().isPresent() && !address.getPostcode().get().isBlank()) {
-                        w.println("Postcode: {}", address.getPostcode().get());
-                    }
-                    if (address.getCountry().isPresent() && !address.getCountry().get().isBlank()) {
-                        w.println("Country: {}", address.getCountry().get());
+                    if (address.country().isPresent() && !address.country().get().isBlank()) {
+                        w.println("Country: {}", address.country().get());

                     }
                 });
             }
                     }
                 });
             }


@@ -609,87 +542,97 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     }
 
     private void printGroupContext(
     }
 
     private void printGroupContext(

-            final PlainTextWriter writer, final SignalServiceGroupContext groupContext
-    ) throws IOException {
-        final GroupId groupId = GroupUtils.getGroupId(groupContext);
-        if (groupContext.getGroupV1().isPresent()) {
-            SignalServiceGroup groupInfo = groupContext.getGroupV1().get();
-            printGroupInfo(writer, groupId);
-            writer.println("Type: {}", groupInfo.getType());
-            if (groupInfo.getMembers().isPresent()) {
-                writer.println("Members:");
-                for (SignalServiceAddress member : groupInfo.getMembers().get()) {
-                    writer.println("- {}", formatContact(member));
-                }
-            }
-            if (groupInfo.getAvatar().isPresent()) {
-                writer.println("Avatar:");
-                printAttachment(writer.indentedWriter(), groupInfo.getAvatar().get());
-            }
-        } else if (groupContext.getGroupV2().isPresent()) {
-            final SignalServiceGroupV2 groupInfo = groupContext.getGroupV2().get();
-            printGroupInfo(writer, groupId);
-            writer.println("Revision: {}", groupInfo.getRevision());
-            writer.println("Master key length: {}", groupInfo.getMasterKey().serialize().length);
-            writer.println("Has signed group change: {}", groupInfo.hasSignedGroupChange());
-        }
+            final PlainTextWriter writer, final MessageEnvelope.Data.GroupContext groupContext
+    ) {
+        printGroupInfo(writer, groupContext.groupId());
+        writer.println("Revision: {}", groupContext.revision());
+        writer.println("Type: {}", groupContext.isGroupUpdate() ? "UPDATE" : "DELIVER");

     }
 
     }
 

-    private void printGroupInfo(final PlainTextWriter writer, final GroupId groupId) throws IOException {
+    private void printStoryContext(
+            final PlainTextWriter writer, final MessageEnvelope.Data.StoryContext storyContext
+    ) {
+        writer.println("Sender: {}", formatContact(storyContext.author()));
+        writer.println("Sent timestamp: {}", storyContext.sentTimestamp());
+    }
+
+    private void printGroupInfo(final PlainTextWriter writer, final GroupId groupId) {

         writer.println("Id: {}", groupId.toBase64());
 
         writer.println("Id: {}", groupId.toBase64());
 

-        GroupInfo group = m.getGroup(groupId);
+        var group = m.getGroup(groupId);

         if (group != null) {
         if (group != null) {

-            writer.println("Name: {}", group.getTitle());
+            writer.println("Name: {}", group.title());

         } else {
             writer.println("Name: <Unknown group>");
         }
     }
 
     private void printMention(
         } else {
             writer.println("Name: <Unknown group>");
         }
     }
 
     private void printMention(

-            PlainTextWriter writer, SignalServiceDataMessage.Mention mention
-    ) throws IOException {
-        final SignalServiceAddress address = m.resolveSignalServiceAddress(new SignalServiceAddress(mention.getUuid(),
-                null));
-        writer.println("- {}: {} (length: {})", formatContact(address), mention.getStart(), mention.getLength());
+            PlainTextWriter writer, MessageEnvelope.Data.Mention mention
+    ) {
+        writer.println("- {}: {} (length: {})", formatContact(mention.recipient()), mention.start(), mention.length());

     }
 
     }
 

-    private void printAttachment(PlainTextWriter writer, SignalServiceAttachment attachment) throws IOException {
-        writer.println("Content-Type: {}", attachment.getContentType());
-        writer.println("Type: {}", attachment.isPointer() ? "Pointer" : attachment.isStream() ? "Stream" : "<unknown>");
-        if (attachment.isPointer()) {
-            final SignalServiceAttachmentPointer pointer = attachment.asPointer();
-            writer.println("Id: {} Key length: {}", pointer.getRemoteId(), pointer.getKey().length);
-            if (pointer.getUploadTimestamp() > 0) {
-                writer.println("Upload timestamp: {}", DateUtils.formatTimestamp(pointer.getUploadTimestamp()));
-            }
-            if (pointer.getCaption().isPresent()) {
-                writer.println("Caption: {}", pointer.getCaption().get());
-            }
-            if (pointer.getFileName().isPresent()) {
-                writer.println("Filename: {}", pointer.getFileName().get());
-            }
+    private void printTextStyle(
+            PlainTextWriter writer, TextStyle textStyle
+    ) {
+        writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length());
+    }
+
+    private void printAttachment(PlainTextWriter writer, MessageEnvelope.Data.Attachment attachment) {
+        writer.println("Content-Type: {}", attachment.contentType());
+        writer.println("Type: {}", attachment.id().isPresent() ? "Pointer" : "Stream");
+        if (attachment.id().isPresent()) {
+            writer.println("Id: {}", attachment.id().get());
+        }
+        if (attachment.uploadTimestamp().isPresent()) {
+            writer.println("Upload timestamp: {}", DateUtils.formatTimestamp(attachment.uploadTimestamp().get()));
+        }
+        if (attachment.caption().isPresent()) {
+            writer.println("Caption: {}", attachment.caption().get());
+        }
+        if (attachment.fileName().isPresent()) {
+            writer.println("Filename: {}", attachment.fileName().get());
+        }
+        if (attachment.size().isPresent() || attachment.preview().isPresent()) {

             writer.println("Size: {}{}",
             writer.println("Size: {}{}",

-                    pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>",
-                    pointer.getPreview().isPresent() ? " (Preview is available: "
-                            + pointer.getPreview().get().length
+                    attachment.size().isPresent() ? attachment.size().get() + " bytes" : "<unavailable>",
+                    attachment.preview().isPresent() ? " (Preview is available: "
+                            + attachment.preview().get().length

                             + " bytes)" : "");
                             + " bytes)" : "");

-            writer.println("Voice note: {}", pointer.getVoiceNote() ? "yes" : "no");
-            writer.println("Borderless: {}", pointer.isBorderless() ? "yes" : "no");
-            if (pointer.getWidth() > 0 || pointer.getHeight() > 0) {
-                writer.println("Dimensions: {}x{}", pointer.getWidth(), pointer.getHeight());
-            }
-            File file = m.getAttachmentFile(pointer.getRemoteId());
+        }
+        if (attachment.thumbnail().isPresent()) {
+            writer.println("Thumbnail:");
+            printAttachment(writer.indentedWriter(), attachment.thumbnail().get());
+        }
+        final var flags = new ArrayList<String>();
+        if (attachment.isVoiceNote()) {
+            flags.add("voice note");
+        }
+        if (attachment.isBorderless()) {
+            flags.add("borderless");
+        }
+        if (attachment.isGif()) {
+            flags.add("video gif");
+        }
+        if (flags.size() > 0) {
+            writer.println("Flags: {}", String.join(", ", flags));
+        }
+        if (attachment.width().isPresent() || attachment.height().isPresent()) {
+            writer.println("Dimensions: {}x{}", attachment.width().orElse(0), attachment.height().orElse(0));
+        }
+        if (attachment.file().isPresent()) {
+            var file = attachment.file().get();

             if (file.exists()) {
                 writer.println("Stored plaintext in: {}", file);
             }
         }
     }
 
             if (file.exists()) {
                 writer.println("Stored plaintext in: {}", file);
             }
         }
     }
 

-    private String formatContact(SignalServiceAddress address) {
-        final String number = address.getLegacyIdentifier();
-        String name = m.getContactOrProfileName(number);
-        if (name == null) {
+    private String formatContact(RecipientAddress address) {
+        final var number = address.getLegacyIdentifier();
+        final var name = m.getContactOrProfileName(RecipientIdentifier.Single.fromAddress(address));
+        if (name == null || name.isEmpty()) {

             return number;
         } else {
             return MessageFormatter.arrayFormat("“{}” {}", new Object[]{name, number}).getMessage();
             return number;
         } else {
             return MessageFormatter.arrayFormat("“{}” {}", new Object[]{name, number}).getMessage();