X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/15da210de7d3540fef3603d71514a1283c503450..eca3c6fa30a8c6c72599a80cea39d674db1c0d65:/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 c5270030..f6eb660e 100644
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -1,11 +1,12 @@
 package org.asamk.signal;
 
 import org.asamk.signal.manager.Manager;
+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.manager.groups.GroupId;
 import org.asamk.signal.output.PlainTextWriter;
 import org.asamk.signal.util.DateUtils;
 import org.asamk.signal.util.Hex;
@@ -69,6 +70,10 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             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);
@@ -122,7 +127,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             final var groupCallUpdate = message.groupCallUpdate().get();
             writer.indentedWriter().println("Era id: {}", groupCallUpdate.eraId());
         }
-        if (message.previews().size() > 0) {
+        if (!message.previews().isEmpty()) {
             writer.println("Previews:");
             final var previews = message.previews();
             for (var preview : previews) {
@@ -130,7 +135,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                 printPreview(writer.indentedWriter(), preview);
             }
         }
-        if (message.sharedContacts().size() > 0) {
+        if (!message.sharedContacts().isEmpty()) {
             writer.println("Contacts:");
             for (var contact : message.sharedContacts()) {
                 writer.println("- Contact:");
@@ -171,19 +176,19 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             final var remoteDelete = message.remoteDeleteId().get();
             writer.println("Remote delete message: timestamp = {}", remoteDelete);
         }
-        if (message.mentions().size() > 0) {
+        if (!message.mentions().isEmpty()) {
             writer.println("Mentions:");
             for (var mention : message.mentions()) {
                 printMention(writer, mention);
             }
         }
-        if (message.textStyles().size() > 0) {
+        if (!message.textStyles().isEmpty()) {
             writer.println("Text styles:");
             for (var textStyle : message.textStyles()) {
                 printTextStyle(writer, textStyle);
             }
         }
-        if (message.attachments().size() > 0) {
+        if (!message.attachments().isEmpty()) {
             writer.println("Attachments:");
             for (var attachment : message.attachments()) {
                 writer.println("- Attachment:");
@@ -192,6 +197,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
     }
 
+    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
     ) {
@@ -261,7 +273,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         }
         if (callMessage.answer().isPresent()) {
             var answerMessage = callMessage.answer().get();
-            writer.println("Answer message: {}, sdp: {})", answerMessage.id(), answerMessage.sdp());
+            writer.println("Answer message: {}, opaque length: {})", answerMessage.id(), answerMessage.opaque().length);
         }
         if (callMessage.busy().isPresent()) {
             var busyMessage = callMessage.busy().get();
@@ -271,16 +283,16 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             var hangupMessage = callMessage.hangup().get();
             writer.println("Hangup message: {}", hangupMessage.id());
         }
-        if (callMessage.iceUpdate().size() > 0) {
+        if (!callMessage.iceUpdate().isEmpty()) {
             writer.println("Ice update messages:");
             var iceUpdateMessages = callMessage.iceUpdate();
             for (var iceUpdateMessage : iceUpdateMessages) {
-                writer.println("- {}, sdp: {}", iceUpdateMessage.id(), iceUpdateMessage.sdp());
+                writer.println("- {}, opaque length: {}", iceUpdateMessage.id(), iceUpdateMessage.opaque().length);
             }
         }
         if (callMessage.offer().isPresent()) {
             var offerMessage = callMessage.offer().get();
-            writer.println("Offer message: {}, sdp: {}", offerMessage.id(), offerMessage.sdp());
+            writer.println("Offer message: {}, opaque length: {}", offerMessage.id(), offerMessage.opaque().length);
         }
         if (callMessage.opaque().isPresent()) {
             final var opaqueMessage = callMessage.opaque().get();
@@ -301,7 +313,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (syncMessage.groups().isPresent()) {
             writer.println("Received sync groups.");
         }
-        if (syncMessage.read().size() > 0) {
+        if (!syncMessage.read().isEmpty()) {
             writer.println("Received sync read messages list");
             for (var rm : syncMessage.read()) {
                 writer.println("- From: {} Message timestamp: {}",
@@ -309,7 +321,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                         DateUtils.formatTimestamp(rm.timestamp()));
             }
         }
-        if (syncMessage.viewed().size() > 0) {
+        if (!syncMessage.viewed().isEmpty()) {
             writer.println("Received sync viewed messages list");
             for (var vm : syncMessage.viewed()) {
                 writer.println("- From: {} Message timestamp: {}",
@@ -323,7 +335,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             String to;
             if (sentTranscriptMessage.destination().isPresent()) {
                 to = formatContact(sentTranscriptMessage.destination().get());
-            } else if (sentTranscriptMessage.recipients().size() > 0) {
+            } else if (!sentTranscriptMessage.recipients().isEmpty()) {
                 to = sentTranscriptMessage.recipients()
                         .stream()
                         .map(this::formatContact)
@@ -417,13 +429,13 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (quote.text().isPresent()) {
             writer.println("Text: {}", quote.text().get());
         }
-        if (quote.mentions() != null && quote.mentions().size() > 0) {
+        if (quote.mentions() != null && !quote.mentions().isEmpty()) {
             writer.println("Mentions:");
             for (var mention : quote.mentions()) {
                 printMention(writer, mention);
             }
         }
-        if (quote.attachments().size() > 0) {
+        if (!quote.attachments().isEmpty()) {
             writer.println("Attachments:");
             for (var attachment : quote.attachments()) {
                 writer.println("- Attachment:");
@@ -466,7 +478,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             writer.println("Organisation: {}", contact.organization().get());
         }
 
-        if (contact.phone().size() > 0) {
+        if (!contact.phone().isEmpty()) {
             writer.println("Phone details:");
             for (var phone : contact.phone()) {
                 writer.println("- Phone:");
@@ -480,7 +492,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
         }
 
-        if (contact.email().size() > 0) {
+        if (!contact.email().isEmpty()) {
             writer.println("Email details:");
             for (var email : contact.email()) {
                 writer.println("- Email:");
@@ -494,7 +506,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
             }
         }
 
-        if (contact.address().size() > 0) {
+        if (!contact.address().isEmpty()) {
             writer.println("Address details:");
             for (var address : contact.address()) {
                 writer.println("- Address:");
@@ -562,7 +574,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     }
 
     private void printTextStyle(
-            PlainTextWriter writer, MessageEnvelope.Data.TextStyle textStyle
+            PlainTextWriter writer, TextStyle textStyle
     ) {
         writer.println("- {}: {} (length: {})", textStyle.style().name(), textStyle.start(), textStyle.length());
     }
@@ -603,7 +615,7 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (attachment.isGif()) {
             flags.add("video gif");
         }
-        if (flags.size() > 0) {
+        if (!flags.isEmpty()) {
             writer.println("Flags: {}", String.join(", ", flags));
         }
         if (attachment.width().isPresent() || attachment.height().isPresent()) {