]> nmode's Git Repositories - signal-cli/blobdiff - src/main/java/org/asamk/signal/ReceiveMessageHandler.java
Update user agent
[signal-cli] / src / main / java / org / asamk / signal / ReceiveMessageHandler.java
index 34d941ed283e5ab2fe37e0f618438ed88f35c575..f6eb660ecf28c95effc9e6ebfbfa5dd04672eeae 100644 (file)
 package org.asamk.signal;
 
 import org.asamk.signal.manager.Manager;
-import org.asamk.signal.storage.contacts.ContactInfo;
-import org.asamk.signal.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.Util;
-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.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.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.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 org.whispersystems.util.Base64;
-
-import java.io.File;
-import java.util.List;
+import org.asamk.signal.util.Hex;
+import org.slf4j.helpers.MessageFormatter;
+
+import java.util.ArrayList;
+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.writer = writer;
     }
 
     @Override
-    public void handleMessage(SignalServiceEnvelope envelope, SignalServiceContent content, Throwable exception) {
-        if (!envelope.isUnidentifiedSender() && envelope.hasSource()) {
-            SignalServiceAddress source = envelope.getSourceAddress();
-            ContactInfo sourceContact = m.getContact(source.getNumber().get());
-            System.out.println(String.format("Envelope from: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + source.getNumber().get(), envelope.getSourceDevice()));
-            if (source.getRelay().isPresent()) {
-                System.out.println("Relayed by: " + source.getRelay().get());
-            }
-        } else {
-            System.out.println("Envelope from: unknown source");
+    public void handleMessage(MessageEnvelope envelope, Throwable exception) {
+        synchronized (writer) {
+            handleMessageInternal(envelope, exception);
         }
-        System.out.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()) {
-            System.out.println("Sent by unidentified/sealed sender");
-        }
-
-        if (envelope.isReceipt()) {
-            System.out.println("Got receipt.");
-        } else if (envelope.isSignalMessage() || envelope.isPreKeySignalMessage() || envelope.isUnidentifiedSender()) {
-            if (exception != null) {
-                if (exception instanceof org.whispersystems.libsignal.UntrustedIdentityException) {
-                    org.whispersystems.libsignal.UntrustedIdentityException e = (org.whispersystems.libsignal.UntrustedIdentityException) exception;
-                    System.out.println("The user’s key is untrusted, either the user has reinstalled Signal or a third party sent this message.");
-                    System.out.println("Use 'signal-cli -u " + m.getUsername() + " listIdentities -n " + e.getName() + "', verify the key and run 'signal-cli -u " + m.getUsername() + " trust -v \"FINGER_PRINT\" " + e.getName() + "' to mark it as trusted");
-                    System.out.println("If you don't care about security, use 'signal-cli -u " + m.getUsername() + " trust -a " + e.getName() + "' to trust it without verification");
-                } else {
-                    System.out.println("Exception: " + exception.getMessage() + " (" + exception.getClass().getSimpleName() + ")");
-                }
+            writer.println("Sent by unidentified/sealed sender");
+        }
+
+        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 {
+                writer.println("Exception: {} ({})", exception.getMessage(), exception.getClass().getSimpleName());
+            }
+        }
+
+        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(
+            PlainTextWriter writer, MessageEnvelope.Data message
+    ) {
+        writer.println("Message timestamp: {}", DateUtils.formatTimestamp(message.timestamp()));
+        if (message.isViewOnce()) {
+            writer.println("=VIEW ONCE=");
+        }
+
+        if (message.body().isPresent()) {
+            writer.println("Body: {}", message.body().get());
+        }
+        if (message.groupContext().isPresent()) {
+            writer.println("Group info:");
+            final var groupContext = message.groupContext().get();
+            printGroupContext(writer.indentedWriter(), groupContext);
+        }
+        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:");
+            final var groupCallUpdate = message.groupCallUpdate().get();
+            writer.indentedWriter().println("Era id: {}", groupCallUpdate.eraId());
+        }
+        if (!message.previews().isEmpty()) {
+            writer.println("Previews:");
+            final var previews = message.previews();
+            for (var preview : previews) {
+                writer.println("- Preview");
+                printPreview(writer.indentedWriter(), preview);
+            }
+        }
+        if (!message.sharedContacts().isEmpty()) {
+            writer.println("Contacts:");
+            for (var contact : message.sharedContacts()) {
+                writer.println("- Contact:");
+                printSharedContact(writer.indentedWriter(), contact);
+            }
+        }
+        if (message.sticker().isPresent()) {
+            final var sticker = message.sticker().get();
+            writer.println("Sticker:");
+            printSticker(writer.indentedWriter(), sticker);
+        }
+        if (message.isEndSession()) {
+            writer.println("Is end session");
+        }
+        if (message.isExpirationUpdate()) {
+            writer.println("Is Expiration update: true");
+        }
+        if (message.expiresInSeconds() > 0) {
+            writer.println("Expires in: {} seconds", message.expiresInSeconds());
+        }
+        if (message.isProfileKeyUpdate()) {
+            writer.println("Profile key update");
+        }
+        if (message.hasProfileKey()) {
+            writer.println("With profile key");
+        }
+        if (message.reaction().isPresent()) {
+            writer.println("Reaction:");
+            final var reaction = message.reaction().get();
+            printReaction(writer.indentedWriter(), reaction);
+        }
+        if (message.quote().isPresent()) {
+            writer.println("Quote:");
+            var quote = message.quote().get();
+            printQuote(writer.indentedWriter(), quote);
+        }
+        if (message.remoteDeleteId().isPresent()) {
+            final var remoteDelete = message.remoteDeleteId().get();
+            writer.println("Remote delete message: timestamp = {}", remoteDelete);
+        }
+        if (!message.mentions().isEmpty()) {
+            writer.println("Mentions:");
+            for (var mention : message.mentions()) {
+                printMention(writer, mention);
+            }
+        }
+        if (!message.textStyles().isEmpty()) {
+            writer.println("Text styles:");
+            for (var textStyle : message.textStyles()) {
+                printTextStyle(writer, textStyle);
             }
-            if (content == null) {
-                System.out.println("Failed to decrypt message.");
+        }
+        if (!message.attachments().isEmpty()) {
+            writer.println("Attachments:");
+            for (var attachment : message.attachments()) {
+                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(
+            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:");
+            final var groupId = typingMessage.groupId().get();
+            printGroupInfo(writer.indentedWriter(), groupId);
+        }
+    }
+
+    private void printReceiptMessage(
+            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");
+        }
+        if (receiptMessage.type() == MessageEnvelope.Receipt.Type.READ) {
+            writer.println("Is read receipt");
+        }
+        if (receiptMessage.type() == MessageEnvelope.Receipt.Type.VIEWED) {
+            writer.println("Is viewed receipt");
+        }
+        writer.println("Timestamps:");
+        for (long timestamp : receiptMessage.timestamps()) {
+            writer.println("- {}", DateUtils.formatTimestamp(timestamp));
+        }
+    }
+
+    private void printCallMessage(
+            final PlainTextWriter writer, final MessageEnvelope.Call callMessage
+    ) {
+        if (callMessage.destinationDeviceId().isPresent()) {
+            final var deviceId = callMessage.destinationDeviceId().get();
+            writer.println("Destination device id: {}", deviceId);
+        }
+        if (callMessage.groupId().isPresent()) {
+            final var groupId = callMessage.groupId().get();
+            writer.println("Destination group id: {}", groupId);
+        }
+        if (callMessage.timestamp().isPresent()) {
+            writer.println("Timestamp: {}", DateUtils.formatTimestamp(callMessage.timestamp().get()));
+        }
+        if (callMessage.answer().isPresent()) {
+            var answerMessage = callMessage.answer().get();
+            writer.println("Answer message: {}, opaque length: {})", answerMessage.id(), answerMessage.opaque().length);
+        }
+        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().isEmpty()) {
+            writer.println("Ice update messages:");
+            var iceUpdateMessages = callMessage.iceUpdate();
+            for (var iceUpdateMessage : iceUpdateMessages) {
+                writer.println("- {}, opaque length: {}", iceUpdateMessage.id(), iceUpdateMessage.opaque().length);
+            }
+        }
+        if (callMessage.offer().isPresent()) {
+            var offerMessage = callMessage.offer().get();
+            writer.println("Offer message: {}, opaque length: {}", offerMessage.id(), offerMessage.opaque().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(
+            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);
+        }
+        if (syncMessage.groups().isPresent()) {
+            writer.println("Received sync groups.");
+        }
+        if (!syncMessage.read().isEmpty()) {
+            writer.println("Received sync read messages list");
+            for (var rm : syncMessage.read()) {
+                writer.println("- From: {} Message timestamp: {}",
+                        formatContact(rm.sender()),
+                        DateUtils.formatTimestamp(rm.timestamp()));
+            }
+        }
+        if (!syncMessage.viewed().isEmpty()) {
+            writer.println("Received sync viewed messages list");
+            for (var vm : syncMessage.viewed()) {
+                writer.println("- From: {} Message timestamp: {}",
+                        formatContact(vm.sender()),
+                        DateUtils.formatTimestamp(vm.timestamp()));
+            }
+        }
+        if (syncMessage.sent().isPresent()) {
+            writer.println("Received sync sent message");
+            final var sentTranscriptMessage = syncMessage.sent().get();
+            String to;
+            if (sentTranscriptMessage.destination().isPresent()) {
+                to = formatContact(sentTranscriptMessage.destination().get());
+            } else if (!sentTranscriptMessage.recipients().isEmpty()) {
+                to = sentTranscriptMessage.recipients()
+                        .stream()
+                        .map(this::formatContact)
+                        .collect(Collectors.joining(", "));
             } else {
-                ContactInfo sourceContact = m.getContact(content.getSender().getNumber().get());
-                System.out.println(String.format("Sender: %s (device: %d)", (sourceContact == null ? "" : "“" + sourceContact.name + "” ") + content.getSender().getNumber().get(), content.getSenderDevice()));
-                if (content.getDataMessage().isPresent()) {
-                    SignalServiceDataMessage message = content.getDataMessage().get();
-                    handleSignalServiceDataMessage(message);
-                }
-                if (content.getSyncMessage().isPresent()) {
-                    System.out.println("Received a sync message");
-                    SignalServiceSyncMessage syncMessage = content.getSyncMessage().get();
-
-                    if (syncMessage.getContacts().isPresent()) {
-                        final ContactsMessage contactsMessage = syncMessage.getContacts().get();
-                        if (contactsMessage.isComplete()) {
-                            System.out.println("Received complete sync contacts");
-                        } else {
-                            System.out.println("Received sync contacts");
-                        }
-                        printAttachment(contactsMessage.getContactsStream());
-                    }
-                    if (syncMessage.getGroups().isPresent()) {
-                        System.out.println("Received sync groups");
-                        printAttachment(syncMessage.getGroups().get());
-                    }
-                    if (syncMessage.getRead().isPresent()) {
-                        System.out.println("Received sync read messages list");
-                        for (ReadMessage rm : syncMessage.getRead().get()) {
-                            ContactInfo fromContact = m.getContact(rm.getSender().getNumber().get());
-                            System.out.println("From: " + (fromContact == null ? "" : "“" + fromContact.name + "” ") + rm.getSender().getNumber() + " Message timestamp: " + DateUtils.formatTimestamp(rm.getTimestamp()));
-                        }
-                    }
-                    if (syncMessage.getRequest().isPresent()) {
-                        System.out.println("Received sync request");
-                        if (syncMessage.getRequest().get().isContactsRequest()) {
-                            System.out.println(" - contacts request");
-                        }
-                        if (syncMessage.getRequest().get().isGroupsRequest()) {
-                            System.out.println(" - groups request");
-                        }
-                    }
-                    if (syncMessage.getSent().isPresent()) {
-                        System.out.println("Received sync sent message");
-                        final SentTranscriptMessage sentTranscriptMessage = syncMessage.getSent().get();
-                        String to;
-                        if (sentTranscriptMessage.getDestination().isPresent()) {
-                            String dest = sentTranscriptMessage.getDestination().get().getNumber().get();
-                            ContactInfo destContact = m.getContact(dest);
-                            to = (destContact == null ? "" : "“" + destContact.name + "” ") + dest;
-                        } else {
-                            to = "Unknown";
-                        }
-                        System.out.println("To: " + to + " , Message timestamp: " + DateUtils.formatTimestamp(sentTranscriptMessage.getTimestamp()));
-                        if (sentTranscriptMessage.getExpirationStartTimestamp() > 0) {
-                            System.out.println("Expiration started at: " + DateUtils.formatTimestamp(sentTranscriptMessage.getExpirationStartTimestamp()));
-                        }
-                        SignalServiceDataMessage message = sentTranscriptMessage.getMessage();
-                        handleSignalServiceDataMessage(message);
-                    }
-                    if (syncMessage.getBlockedList().isPresent()) {
-                        System.out.println("Received sync message with block list");
-                        System.out.println("Blocked numbers:");
-                        final BlockedListMessage blockedList = syncMessage.getBlockedList().get();
-                        for (SignalServiceAddress address : blockedList.getAddresses()) {
-                            System.out.println(" - " + address.getNumber());
-                        }
-                    }
-                    if (syncMessage.getVerified().isPresent()) {
-                        System.out.println("Received sync message with verified identities:");
-                        final VerifiedMessage verifiedMessage = syncMessage.getVerified().get();
-                        System.out.println(" - " + verifiedMessage.getDestination() + ": " + verifiedMessage.getVerified());
-                        String safetyNumber = Util.formatSafetyNumber(m.computeSafetyNumber(verifiedMessage.getDestination().getNumber().get(), verifiedMessage.getIdentityKey()));
-                        System.out.println("   " + safetyNumber);
-                    }
-                    if (syncMessage.getConfiguration().isPresent()) {
-                        System.out.println("Received sync message with configuration:");
-                        final ConfigurationMessage configurationMessage = syncMessage.getConfiguration().get();
-                        if (configurationMessage.getReadReceipts().isPresent()) {
-                            System.out.println(" - Read receipts: " + (configurationMessage.getReadReceipts().get() ? "enabled" : "disabled"));
-                        }
-                    }
-                    if (syncMessage.getFetchType().isPresent()) {
-                        final SignalServiceSyncMessage.FetchType fetchType = syncMessage.getFetchType().get();
-                        System.out.println("Received sync message with fetch type: " + fetchType.toString());
-                    }
-                    if (syncMessage.getViewOnceOpen().isPresent()) {
-                        final ViewOnceOpenMessage viewOnceOpenMessage = syncMessage.getViewOnceOpen().get();
-                        System.out.println("Received sync message with view once open message:");
-                        System.out.println(" - Sender:" + viewOnceOpenMessage.getSender().getNumber());
-                        System.out.println(" - Timestamp:" + viewOnceOpenMessage.getTimestamp());
-                    }
-                    if (syncMessage.getStickerPackOperations().isPresent()) {
-                        final List<StickerPackOperationMessage> stickerPackOperationMessages = syncMessage.getStickerPackOperations().get();
-                        System.out.println("Received sync message with sticker pack operations:");
-                        for (StickerPackOperationMessage m : stickerPackOperationMessages) {
-                            System.out.println(" - " + m.getType().toString());
-                            if (m.getPackId().isPresent()) {
-                                System.out.println("   packId: " + Base64.encodeBytes(m.getPackId().get()));
-                            }
-                            if (m.getPackKey().isPresent()) {
-                                System.out.println("   packKey: " + Base64.encodeBytes(m.getPackKey().get()));
-                            }
-                        }
+                to = "<unknown>";
+            }
+            writer.indentedWriter().println("To: {}", to);
+            writer.indentedWriter()
+                    .println("Timestamp: {}", DateUtils.formatTimestamp(sentTranscriptMessage.timestamp()));
+            if (sentTranscriptMessage.expirationStartTimestamp() > 0) {
+                writer.indentedWriter()
+                        .println("Expiration started at: {}",
+                                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);
+            }
+        }
+        if (syncMessage.blocked().isPresent()) {
+            writer.println("Received sync message with block list");
+            writer.println("Blocked:");
+            final var blockedList = syncMessage.blocked().get();
+            for (var address : blockedList.recipients()) {
+                writer.println("- {}", address.getLegacyIdentifier());
+            }
+            for (var groupId : blockedList.groupIds()) {
+                writer.println("- {}", groupId.toBase64());
+            }
+        }
+        if (syncMessage.viewOnceOpen().isPresent()) {
+            final var viewOnceOpenMessage = syncMessage.viewOnceOpen().get();
+            writer.println("Received sync message with view once open message:");
+            writer.indentedWriter().println("Sender: {}", formatContact(viewOnceOpenMessage.sender()));
+            writer.indentedWriter()
+                    .println("Timestamp: {}", DateUtils.formatTimestamp(viewOnceOpenMessage.timestamp()));
+        }
+        if (syncMessage.messageRequestResponse().isPresent()) {
+            final var requestResponseMessage = syncMessage.messageRequestResponse().get();
+            writer.println("Received message request response:");
+            writer.indentedWriter().println("Type: {}", requestResponseMessage.type());
+            if (requestResponseMessage.groupId().isPresent()) {
+                writer.println("For group:");
+                printGroupInfo(writer.indentedWriter(), requestResponseMessage.groupId().get());
+            }
+            if (requestResponseMessage.person().isPresent()) {
+                writer.indentedWriter().println("For Person: {}", formatContact(requestResponseMessage.person().get()));
+            }
+        }
+    }
+
+    private void printPreview(
+            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:");
+            printAttachment(writer.indentedWriter(), preview.image().get());
+        }
+    }
+
+    private void printSticker(
+            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(
+            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(
+            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().isEmpty()) {
+            writer.println("Mentions:");
+            for (var mention : quote.mentions()) {
+                printMention(writer, mention);
+            }
+        }
+        if (!quote.attachments().isEmpty()) {
+            writer.println("Attachments:");
+            for (var attachment : quote.attachments()) {
+                writer.println("- Attachment:");
+                printAttachment(writer.indentedWriter(), attachment);
+            }
+        }
+    }
+
+    private void printSharedContact(final PlainTextWriter writer, final MessageEnvelope.Data.SharedContact contact) {
+        writer.println("Name:");
+        var name = contact.name();
+        writer.indent(w -> {
+            if (name.display().isPresent() && !name.display().get().isBlank()) {
+                w.println("Display name: {}", name.display().get());
+            }
+            if (name.given().isPresent() && !name.given().get().isBlank()) {
+                w.println("First name: {}", name.given().get());
+            }
+            if (name.middle().isPresent() && !name.middle().get().isBlank()) {
+                w.println("Middle name: {}", name.middle().get());
+            }
+            if (name.family().isPresent() && !name.family().get().isBlank()) {
+                w.println("Family name: {}", name.family().get());
+            }
+            if (name.prefix().isPresent() && !name.prefix().get().isBlank()) {
+                w.println("Prefix name: {}", name.prefix().get());
+            }
+            if (name.suffix().isPresent() && !name.suffix().get().isBlank()) {
+                w.println("Suffix name: {}", name.suffix().get());
+            }
+        });
+
+        if (contact.avatar().isPresent()) {
+            var avatar = contact.avatar().get();
+            writer.println("Avatar: (profile: {})", avatar.isProfile());
+            printAttachment(writer.indentedWriter(), avatar.attachment());
+        }
+
+        if (contact.organization().isPresent()) {
+            writer.println("Organisation: {}", contact.organization().get());
+        }
+
+        if (!contact.phone().isEmpty()) {
+            writer.println("Phone details:");
+            for (var phone : contact.phone()) {
+                writer.println("- Phone:");
+                writer.indent(w -> {
+                    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 (content.getCallMessage().isPresent()) {
-                    System.out.println("Received a call message");
-                    SignalServiceCallMessage callMessage = content.getCallMessage().get();
-                    if (callMessage.getAnswerMessage().isPresent()) {
-                        AnswerMessage answerMessage = callMessage.getAnswerMessage().get();
-                        System.out.println("Answer message: " + answerMessage.getId() + ": " + answerMessage.getDescription());
+                });
+            }
+        }
+
+        if (!contact.email().isEmpty()) {
+            writer.println("Email details:");
+            for (var email : contact.email()) {
+                writer.println("- Email:");
+                writer.indent(w -> {
+                    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 (callMessage.getBusyMessage().isPresent()) {
-                        BusyMessage busyMessage = callMessage.getBusyMessage().get();
-                        System.out.println("Busy message: " + busyMessage.getId());
+                });
+            }
+        }
+
+        if (!contact.address().isEmpty()) {
+            writer.println("Address details:");
+            for (var address : contact.address()) {
+                writer.println("- Address:");
+                writer.indent(w -> {
+                    w.println("Type: {}", address.type());
+                    if (address.label().isPresent() && !address.label().get().isBlank()) {
+                        w.println("Label: {}", address.label().get());
                     }
-                    if (callMessage.getHangupMessage().isPresent()) {
-                        HangupMessage hangupMessage = callMessage.getHangupMessage().get();
-                        System.out.println("Hangup message: " + hangupMessage.getId());
+                    if (address.street().isPresent() && !address.street().get().isBlank()) {
+                        w.println("Street: {}", address.street().get());
                     }
-                    if (callMessage.getIceUpdateMessages().isPresent()) {
-                        List<IceUpdateMessage> iceUpdateMessages = callMessage.getIceUpdateMessages().get();
-                        for (IceUpdateMessage iceUpdateMessage : iceUpdateMessages) {
-                            System.out.println("Ice update message: " + iceUpdateMessage.getId() + ", sdp: " + iceUpdateMessage.getSdp());
-                        }
+                    if (address.pobox().isPresent() && !address.pobox().get().isBlank()) {
+                        w.println("Pobox: {}", address.pobox().get());
                     }
-                    if (callMessage.getOfferMessage().isPresent()) {
-                        OfferMessage offerMessage = callMessage.getOfferMessage().get();
-                        System.out.println("Offer message: " + offerMessage.getId() + ": " + offerMessage.getDescription());
+                    if (address.neighborhood().isPresent() && !address.neighborhood().get().isBlank()) {
+                        w.println("Neighbourhood: {}", address.neighborhood().get());
                     }
-                }
-                if (content.getReceiptMessage().isPresent()) {
-                    System.out.println("Received a receipt message");
-                    SignalServiceReceiptMessage receiptMessage = content.getReceiptMessage().get();
-                    System.out.println(" - When: " + DateUtils.formatTimestamp(receiptMessage.getWhen()));
-                    if (receiptMessage.isDeliveryReceipt()) {
-                        System.out.println(" - Is delivery receipt");
+                    if (address.city().isPresent() && !address.city().get().isBlank()) {
+                        w.println("City: {}", address.city().get());
                     }
-                    if (receiptMessage.isReadReceipt()) {
-                        System.out.println(" - Is read receipt");
+                    if (address.region().isPresent() && !address.region().get().isBlank()) {
+                        w.println("Region: {}", address.region().get());
                     }
-                    System.out.println(" - Timestamps:");
-                    for (long timestamp : receiptMessage.getTimestamps()) {
-                        System.out.println("    " + DateUtils.formatTimestamp(timestamp));
+                    if (address.postcode().isPresent() && !address.postcode().get().isBlank()) {
+                        w.println("Postcode: {}", address.postcode().get());
                     }
-                }
-                if (content.getTypingMessage().isPresent()) {
-                    System.out.println("Received a typing message");
-                    SignalServiceTypingMessage typingMessage = content.getTypingMessage().get();
-                    System.out.println(" - Action: " + typingMessage.getAction());
-                    System.out.println(" - Timestamp: " + DateUtils.formatTimestamp(typingMessage.getTimestamp()));
-                    if (typingMessage.getGroupId().isPresent()) {
-                        GroupInfo group = m.getGroup(typingMessage.getGroupId().get());
-                        if (group != null) {
-                            System.out.println("  Name: " + group.name);
-                        } else {
-                            System.out.println("  Name: <Unknown group>");
-                        }
+                    if (address.country().isPresent() && !address.country().get().isBlank()) {
+                        w.println("Country: {}", address.country().get());
                     }
-                }
+                });
             }
+        }
+    }
+
+    private void printGroupContext(
+            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 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());
+
+        var group = m.getGroup(groupId);
+        if (group != null) {
+            writer.println("Name: {}", group.title());
         } else {
-            System.out.println("Unknown message received.");
+            writer.println("Name: <Unknown group>");
         }
-        System.out.println();
     }
 
-    private void handleSignalServiceDataMessage(SignalServiceDataMessage message) {
-        System.out.println("Message timestamp: " + DateUtils.formatTimestamp(message.getTimestamp()));
+    private void printMention(
+            PlainTextWriter writer, MessageEnvelope.Data.Mention mention
+    ) {
+        writer.println("- {}: {} (length: {})", formatContact(mention.recipient()), mention.start(), mention.length());
+    }
+
+    private void printTextStyle(
+            PlainTextWriter writer, TextStyle textStyle
+    ) {
+        writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length());
+    }
 
-        if (message.getBody().isPresent()) {
-            System.out.println("Body: " + message.getBody().get());
+    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 (message.getGroupInfo().isPresent()) {
-            SignalServiceGroup groupInfo = message.getGroupInfo().get();
-            System.out.println("Group info:");
-            System.out.println("  Id: " + Base64.encodeBytes(groupInfo.getGroupId()));
-            if (groupInfo.getType() == SignalServiceGroup.Type.UPDATE && groupInfo.getName().isPresent()) {
-                System.out.println("  Name: " + groupInfo.getName().get());
-            } else {
-                GroupInfo group = m.getGroup(groupInfo.getGroupId());
-                if (group != null) {
-                    System.out.println("  Name: " + group.name);
-                } else {
-                    System.out.println("  Name: <Unknown group>");
-                }
-            }
-            System.out.println("  Type: " + groupInfo.getType());
-            if (groupInfo.getMembers().isPresent()) {
-                for (SignalServiceAddress member : groupInfo.getMembers().get()) {
-                    System.out.println("  Member: " + member.getNumber().get());
-                }
-            }
-            if (groupInfo.getAvatar().isPresent()) {
-                System.out.println("  Avatar:");
-                printAttachment(groupInfo.getAvatar().get());
-            }
+        if (attachment.uploadTimestamp().isPresent()) {
+            writer.println("Upload timestamp: {}", DateUtils.formatTimestamp(attachment.uploadTimestamp().get()));
         }
-        if (message.getPreviews().isPresent()) {
-            final List<SignalServiceDataMessage.Preview> previews = message.getPreviews().get();
-            System.out.println("Previes:");
-            for (SignalServiceDataMessage.Preview preview : previews) {
-                System.out.println(" - Title: " + preview.getTitle());
-                System.out.println(" - Url: " + preview.getUrl());
-                if (preview.getImage().isPresent()) {
-                    printAttachment(preview.getImage().get());
-                }
-            }
+        if (attachment.caption().isPresent()) {
+            writer.println("Caption: {}", attachment.caption().get());
         }
-        if (message.getSharedContacts().isPresent()) {
-            final List<SharedContact> sharedContacts = message.getSharedContacts().get();
-            System.out.println("Contacts:");
-            for (SharedContact contact : sharedContacts) {
-                System.out.println(" - Name: " + contact.getName());
-                // TODO show or store rest of the contact info
-            }
+        if (attachment.fileName().isPresent()) {
+            writer.println("Filename: {}", attachment.fileName().get());
         }
-        if (message.getSticker().isPresent()) {
-            final SignalServiceDataMessage.Sticker sticker = message.getSticker().get();
-            System.out.println("Sticker:");
-            System.out.println(" - Pack id: " + Base64.encodeBytes(sticker.getPackId()));
-            System.out.println(" - Pack key: " + Base64.encodeBytes(sticker.getPackKey()));
-            System.out.println(" - Sticker id: " + sticker.getStickerId());
-            // TODO also download sticker image ??
+        if (attachment.size().isPresent() || attachment.preview().isPresent()) {
+            writer.println("Size: {}{}",
+                    attachment.size().isPresent() ? attachment.size().get() + " bytes" : "<unavailable>",
+                    attachment.preview().isPresent() ? " (Preview is available: "
+                            + attachment.preview().get().length
+                            + " bytes)" : "");
         }
-        if (message.isEndSession()) {
-            System.out.println("Is end session");
+        if (attachment.thumbnail().isPresent()) {
+            writer.println("Thumbnail:");
+            printAttachment(writer.indentedWriter(), attachment.thumbnail().get());
         }
-        if (message.isExpirationUpdate()) {
-            System.out.println("Is Expiration update: " + message.isExpirationUpdate());
-        }
-        if (message.getExpiresInSeconds() > 0) {
-            System.out.println("Expires in: " + message.getExpiresInSeconds() + " seconds");
-        }
-        if (message.getProfileKey().isPresent()) {
-            System.out.println("Profile key update, key length:" + message.getProfileKey().get().length);
-        }
-
-        if (message.getReaction().isPresent()) {
-            final SignalServiceDataMessage.Reaction reaction = message.getReaction().get();
-            System.out.println("Reaction:");
-            System.out.println(" - Emoji: " + reaction.getEmoji());
-            System.out.println(" - Target author: " + reaction.getTargetAuthor().getNumber());
-            System.out.println(" - Target timestamp: " + reaction.getTargetSentTimestamp());
-            System.out.println(" - Is remove: " + reaction.isRemove());
-        }
-
-        if (message.getQuote().isPresent()) {
-            SignalServiceDataMessage.Quote quote = message.getQuote().get();
-            System.out.println("Quote: (" + quote.getId() + ")");
-            System.out.println(" Author: " + quote.getAuthor().getNumber());
-            System.out.println(" Text: " + quote.getText());
-            if (quote.getAttachments().size() > 0) {
-                System.out.println(" Attachments: ");
-                for (SignalServiceDataMessage.Quote.QuotedAttachment attachment : quote.getAttachments()) {
-                    System.out.println("  Filename: " + attachment.getFileName());
-                    System.out.println("  Type: " + attachment.getContentType());
-                    System.out.println("  Thumbnail:");
-                    if (attachment.getThumbnail() != null) {
-                        printAttachment(attachment.getThumbnail());
-                    }
-                }
-            }
+        final var flags = new ArrayList<String>();
+        if (attachment.isVoiceNote()) {
+            flags.add("voice note");
         }
-
-        if (message.getAttachments().isPresent()) {
-            System.out.println("Attachments: ");
-            for (SignalServiceAttachment attachment : message.getAttachments().get()) {
-                printAttachment(attachment);
+        if (attachment.isBorderless()) {
+            flags.add("borderless");
+        }
+        if (attachment.isGif()) {
+            flags.add("video gif");
+        }
+        if (!flags.isEmpty()) {
+            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);
             }
         }
     }
 
-    private void printAttachment(SignalServiceAttachment attachment) {
-        System.out.println("- " + attachment.getContentType() + " (" + (attachment.isPointer() ? "Pointer" : "") + (attachment.isStream() ? "Stream" : "") + ")");
-        if (attachment.isPointer()) {
-            final SignalServiceAttachmentPointer pointer = attachment.asPointer();
-            System.out.println("  Id: " + pointer.getId() + " Key length: " + pointer.getKey().length);
-            System.out.println("  Filename: " + (pointer.getFileName().isPresent() ? pointer.getFileName().get() : "-"));
-            System.out.println("  Size: " + (pointer.getSize().isPresent() ? pointer.getSize().get() + " bytes" : "<unavailable>") + (pointer.getPreview().isPresent() ? " (Preview is available: " + pointer.getPreview().get().length + " bytes)" : ""));
-            System.out.println("  Voice note: " + (pointer.getVoiceNote() ? "yes" : "no"));
-            System.out.println("  Dimensions: " + pointer.getWidth() + "x" + pointer.getHeight());
-            File file = m.getAttachmentFile(pointer.getId());
-            if (file.exists()) {
-                System.out.println("  Stored plaintext in: " + file);
-            }
+    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();
         }
     }
 }