Refactor ReceiveCommand in dbus mode and remove ExtendedDbusCommand

[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 0b1ea5bede168d5a41fdf4a3fba66e8fa902f595..26e12809192abf62edaefb897ce165c111077afc 100644 (file)
--- a/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
+++ b/src/main/java/org/asamk/signal/ReceiveMessageHandler.java
@@ -361,7 +361,9 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
     ) {
         writer.println("Id: {}", quote.id());
         writer.println("Author: {}", formatContact(quote.author()));
-        writer.println("Text: {}", quote.text());
+        if (quote.text().isPresent()) {
+            writer.println("Text: {}", quote.text().get());
+        }
         if (quote.mentions() != null && quote.mentions().size() > 0) {
             writer.println("Mentions:");
             for (var mention : quote.mentions()) {
@@ -371,14 +373,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (quote.attachments().size() > 0) {
             writer.println("Attachments:");
             for (var attachment : quote.attachments()) {
-                writer.println("- Filename: {}", attachment.fileName());
-                writer.indent(w -> {
-                    w.println("Type: {}", attachment.contentType());
-                    w.println("Thumbnail:");
-                    if (attachment.thumbnail().isPresent()) {
-                        printAttachment(w, attachment.thumbnail().get());
-                    }
-                });
+                writer.println("- Attachment:");
+                printAttachment(writer.indentedWriter(), attachment);
             }
         }
     }
@@ -527,6 +523,10 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
                             + attachment.preview().get().length
                             + " bytes)" : "");
         }
+        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");
@@ -543,8 +543,8 @@ public class ReceiveMessageHandler implements Manager.ReceiveMessageHandler {
         if (attachment.width().isPresent() || attachment.height().isPresent()) {
             writer.println("Dimensions: {}x{}", attachment.width().orElse(0), attachment.height().orElse(0));
         }
-        if (attachment.id().isPresent()) {
-            var file = m.getAttachmentFile(attachment.id().get());
+        if (attachment.file().isPresent()) {
+            var file = attachment.file().get();
             if (file.exists()) {
                 writer.println("Stored plaintext in: {}", file);
             }