X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/de273586b4106171a3940ce5ec2c2b3712430c8c..0a63dd1db42b23eafa49088aaa61687317ae0008:/src/main/java/org/asamk/signal/commands/ReceiveCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
index 9693d7c2..8612a71b 100644
--- a/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
+++ b/src/main/java/org/asamk/signal/commands/ReceiveCommand.java
@@ -8,7 +8,11 @@ import org.asamk.Signal;
 import org.asamk.signal.JsonReceiveMessageHandler;
 import org.asamk.signal.JsonWriter;
 import org.asamk.signal.OutputType;
+import org.asamk.signal.PlainTextWriterImpl;
 import org.asamk.signal.ReceiveMessageHandler;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.IOErrorException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
 import org.asamk.signal.json.JsonMessageEnvelope;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.util.DateUtils;
@@ -47,7 +51,9 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
         return Set.of(OutputType.PLAIN_TEXT, OutputType.JSON);
     }
 
-    public int handleCommand(final Namespace ns, final Signal signal, DBusConnection dbusconnection) {
+    public void handleCommand(
+            final Namespace ns, final Signal signal, DBusConnection dbusconnection
+    ) throws CommandException {
         var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
 
         // TODO delete later when "json" variable is removed
@@ -55,95 +61,88 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
             logger.warn("\"--json\" option has been deprecated, please use the global \"--output=json\" instead.");
         }
 
-        final var jsonWriter = inJson ? new JsonWriter(System.out) : null;
         try {
-            dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
-                if (jsonWriter != null) {
+            if (inJson) {
+                final var jsonWriter = new JsonWriter(System.out);
+
+                dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
                     var envelope = new JsonMessageEnvelope(messageReceived);
                     final var object = Map.of("envelope", envelope);
-                    try {
-                        jsonWriter.write(object);
-                    } catch (IOException e) {
-                        logger.error("Failed to write json object: {}", e.getMessage());
-                    }
-                } else {
-                    System.out.print(String.format("Envelope from: %s\nTimestamp: %s\nBody: %s\n",
-                            messageReceived.getSender(),
-                            DateUtils.formatTimestamp(messageReceived.getTimestamp()),
-                            messageReceived.getMessage()));
+                    jsonWriter.write(object);
+                });
+
+                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                    var envelope = new JsonMessageEnvelope(receiptReceived);
+                    final var object = Map.of("envelope", envelope);
+                    jsonWriter.write(object);
+                });
+
+                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
+                    var envelope = new JsonMessageEnvelope(syncReceived);
+                    final var object = Map.of("envelope", envelope);
+                    jsonWriter.write(object);
+                });
+            } else {
+                final var writer = new PlainTextWriterImpl(System.out);
+
+                dbusconnection.addSigHandler(Signal.MessageReceived.class, messageReceived -> {
+                    writer.println("Envelope from: {}", messageReceived.getSender());
+                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(messageReceived.getTimestamp()));
+                    writer.println("Body: {}", messageReceived.getMessage());
                     if (messageReceived.getGroupId().length > 0) {
-                        System.out.println("Group info:");
-                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(messageReceived.getGroupId()));
+                        writer.println("Group info:");
+                        writer.indentedWriter()
+                                .println("Id: {}", Base64.getEncoder().encodeToString(messageReceived.getGroupId()));
                     }
                     if (messageReceived.getAttachments().size() > 0) {
-                        System.out.println("Attachments: ");
+                        writer.println("Attachments:");
                         for (var attachment : messageReceived.getAttachments()) {
-                            System.out.println("-  Stored plaintext in: " + attachment);
+                            writer.println("- Stored plaintext in: {}", attachment);
                         }
                     }
-                    System.out.println();
-                }
-            });
+                    writer.println();
+                });
 
-            dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
-                if (jsonWriter != null) {
-                    var envelope = new JsonMessageEnvelope(receiptReceived);
-                    final var object = Map.of("envelope", envelope);
-                    try {
-                        jsonWriter.write(object);
-                    } catch (IOException e) {
-                        logger.error("Failed to write json object: {}", e.getMessage());
-                    }
-                } else {
-                    System.out.print(String.format("Receipt from: %s\nTimestamp: %s\n",
-                            receiptReceived.getSender(),
-                            DateUtils.formatTimestamp(receiptReceived.getTimestamp())));
-                }
-            });
-
-            dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
-                if (jsonWriter != null) {
-                    var envelope = new JsonMessageEnvelope(syncReceived);
-                    final var object = Map.of("envelope", envelope);
-                    try {
-                        jsonWriter.write(object);
-                    } catch (IOException e) {
-                        logger.error("Failed to write json object: {}", e.getMessage());
-                    }
-                } else {
-                    System.out.print(String.format("Sync Envelope from: %s to: %s\nTimestamp: %s\nBody: %s\n",
+                dbusconnection.addSigHandler(Signal.ReceiptReceived.class, receiptReceived -> {
+                    writer.println("Receipt from: {}", receiptReceived.getSender());
+                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(receiptReceived.getTimestamp()));
+                });
+
+                dbusconnection.addSigHandler(Signal.SyncMessageReceived.class, syncReceived -> {
+                    writer.println("Sync Envelope from: {} to: {}",
                             syncReceived.getSource(),
-                            syncReceived.getDestination(),
-                            DateUtils.formatTimestamp(syncReceived.getTimestamp()),
-                            syncReceived.getMessage()));
+                            syncReceived.getDestination());
+                    writer.println("Timestamp: {}", DateUtils.formatTimestamp(syncReceived.getTimestamp()));
+                    writer.println("Body: {}", syncReceived.getMessage());
                     if (syncReceived.getGroupId().length > 0) {
-                        System.out.println("Group info:");
-                        System.out.println("  Id: " + Base64.getEncoder().encodeToString(syncReceived.getGroupId()));
+                        writer.println("Group info:");
+                        writer.indentedWriter()
+                                .println("Id: {}", Base64.getEncoder().encodeToString(syncReceived.getGroupId()));
                     }
                     if (syncReceived.getAttachments().size() > 0) {
-                        System.out.println("Attachments: ");
+                        writer.println("Attachments:");
                         for (var attachment : syncReceived.getAttachments()) {
-                            System.out.println("-  Stored plaintext in: " + attachment);
+                            writer.println("- Stored plaintext in: {}", attachment);
                         }
                     }
-                    System.out.println();
-                }
-            });
+                    writer.println();
+                });
+            }
         } catch (DBusException e) {
-            e.printStackTrace();
-            return 2;
+            logger.error("Dbus client failed", e);
+            throw new UnexpectedErrorException("Dbus client failed");
         }
         while (true) {
             try {
                 Thread.sleep(10000);
-            } catch (InterruptedException e) {
-                return 0;
+            } catch (InterruptedException ignored) {
+                return;
             }
         }
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
+    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
         var inJson = ns.get("output") == OutputType.JSON || ns.getBoolean("json");
 
         // TODO delete later when "json" variable is removed
@@ -168,13 +167,11 @@ public class ReceiveCommand implements ExtendedDbusCommand, LocalCommand {
                     returnOnTimeout,
                     ignoreAttachments,
                     handler);
-            return 0;
         } catch (IOException e) {
-            System.err.println("Error while receiving messages: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Error while receiving messages: " + e.getMessage());
         } catch (AssertionError e) {
             handleAssertionError(e);
-            return 1;
+            throw e;
         }
     }
 }