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

diff --git a/src/main/java/org/asamk/signal/commands/SendCommand.java b/src/main/java/org/asamk/signal/commands/SendCommand.java
index f1768b76..1976fb60 100644
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -5,11 +5,14 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
+import org.asamk.signal.PlainTextWriterImpl;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.errors.UnknownObject;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -20,6 +23,8 @@ import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
 
 public class SendCommand implements DbusCommand {
 
+    private final static Logger logger = LoggerFactory.getLogger(SendCommand.class);
+
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
@@ -90,18 +95,20 @@ public class SendCommand implements DbusCommand {
             attachments = List.of();
         }
 
+        final var writer = new PlainTextWriterImpl(System.out);
+
         if (groupIdString != null) {
+            byte[] groupId;
             try {
-                byte[] groupId;
-                try {
-                    groupId = Util.decodeGroupId(groupIdString).serialize();
-                } catch (GroupIdFormatException e) {
-                    handleGroupIdFormatException(e);
-                    return 1;
-                }
+                groupId = Util.decodeGroupId(groupIdString).serialize();
+            } catch (GroupIdFormatException e) {
+                handleGroupIdFormatException(e);
+                return 1;
+            }
 
+            try {
                 var timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
-                System.out.println(timestamp);
+                writer.println("{}", timestamp);
                 return 0;
             } catch (AssertionError e) {
                 handleAssertionError(e);
@@ -109,13 +116,16 @@ public class SendCommand implements DbusCommand {
             } catch (DBusExecutionException e) {
                 System.err.println("Failed to send group message: " + e.getMessage());
                 return 2;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return 3;
             }
         }
 
         if (isNoteToSelf) {
             try {
                 var timestamp = signal.sendNoteToSelfMessage(messageText, attachments);
-                System.out.println(timestamp);
+                writer.println("{}", timestamp);
                 return 0;
             } catch (AssertionError e) {
                 handleAssertionError(e);
@@ -126,12 +136,15 @@ public class SendCommand implements DbusCommand {
             } catch (DBusExecutionException e) {
                 System.err.println("Failed to send note to self message: " + e.getMessage());
                 return 2;
+            } catch (IOException e) {
+                e.printStackTrace();
+                return 3;
             }
         }
 
         try {
             var timestamp = signal.sendMessage(messageText, attachments, recipients);
-            System.out.println(timestamp);
+            writer.println("{}", timestamp);
             return 0;
         } catch (AssertionError e) {
             handleAssertionError(e);
@@ -145,6 +158,9 @@ public class SendCommand implements DbusCommand {
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());
             return 2;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return 3;
         }
     }
 }