Refactor to use GroupId class to wrap the byte array

[signal-cli] / 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 f431d7086b262ee5b33226325e6d7a337760e54c..04b064340c188cb4a90687c3638191db29ba3b06 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/SendCommand.java
+++ b/src/main/java/org/asamk/signal/commands/SendCommand.java
@@ -5,15 +5,10 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
-import org.asamk.signal.AttachmentInvalidException;
-import org.asamk.signal.GroupIdFormatException;
-import org.asamk.signal.GroupNotFoundException;
-import org.asamk.signal.NotAGroupMemberException;
+import org.asamk.signal.manager.GroupIdFormatException;
 import org.asamk.signal.util.IOUtils;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
 
 import java.io.IOException;
 import java.nio.charset.Charset;
@@ -21,28 +16,16 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleDBusExecutionException;
-import static org.asamk.signal.util.ErrorUtils.handleEncapsulatedExceptions;
 import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
-import static org.asamk.signal.util.ErrorUtils.handleGroupNotFoundException;
-import static org.asamk.signal.util.ErrorUtils.handleIOException;
-import static org.asamk.signal.util.ErrorUtils.handleInvalidNumberException;
-import static org.asamk.signal.util.ErrorUtils.handleNotAGroupMemberException;
 
 public class SendCommand implements DbusCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        subparser.addArgument("recipient")
-                .help("Specify the recipients' phone number.")
-                .nargs("*");
-        subparser.addArgument("-m", "--message")
-                .help("Specify the message, if missing standard input is used.");
-        subparser.addArgument("-a", "--attachment")
-                .nargs("*")
-                .help("Add file as attachment");
+        subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+        subparser.addArgument("recipient").help("Specify the recipients' phone number.").nargs("*");
+        subparser.addArgument("-m", "--message").help("Specify the message, if missing standard input is used.");
+        subparser.addArgument("-a", "--attachment").nargs("*").help("Add file as attachment");
         subparser.addArgument("-e", "--endsession")
                 .help("Clear session state and send end session message.")
                 .action(Arguments.storeTrue());
@@ -55,7 +38,9 @@ public class SendCommand implements DbusCommand {
             return 1;
         }
 
-        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && (ns.getBoolean("endsession") || ns.getString("group") == null)) {
+        if ((ns.getList("recipient") == null || ns.getList("recipient").size() == 0) && (
+                ns.getBoolean("endsession") || ns.getString("group") == null
+        )) {
             System.err.println("No recipients given");
             System.err.println("Aborting sending.");
             return 1;
@@ -65,20 +50,11 @@ public class SendCommand implements DbusCommand {
             try {
                 signal.sendEndSessionMessage(ns.getList("recipient"));
                 return 0;
-            } catch (IOException e) {
-                handleIOException(e);
-                return 3;
-            } catch (EncapsulatedExceptions e) {
-                handleEncapsulatedExceptions(e);
-                return 3;
             } catch (AssertionError e) {
                 handleAssertionError(e);
                 return 1;
             } catch (DBusExecutionException e) {
-                handleDBusExecutionException(e);
-                return 1;
-            } catch (InvalidNumberException e) {
-                handleInvalidNumberException(e);
+                System.err.println("Failed to send message: " + e.getMessage());
                 return 1;
             }
         }
@@ -94,47 +70,42 @@ public class SendCommand implements DbusCommand {
             }
         }
 
+        List<String> attachments = ns.getList("attachment");
+        if (attachments == null) {
+            attachments = new ArrayList<>();
+        }
+
         try {
-            List<String> attachments = ns.getList("attachment");
-            if (attachments == null) {
-                attachments = new ArrayList<>();
-            }
-            long timestamp;
             if (ns.getString("group") != null) {
-                byte[] groupId = Util.decodeGroupId(ns.getString("group"));
-                timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
-            } else {
-                timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient"));
+                byte[] groupId;
+                try {
+                    groupId = Util.decodeGroupId(ns.getString("group")).serialize();
+                } catch (GroupIdFormatException e) {
+                    handleGroupIdFormatException(e);
+                    return 1;
+                }
+
+                long timestamp = signal.sendGroupMessage(messageText, attachments, groupId);
+                System.out.println(timestamp);
+                return 0;
             }
-            System.out.println(timestamp);
-            return 0;
-        } catch (IOException e) {
-            handleIOException(e);
-            return 3;
-        } catch (EncapsulatedExceptions e) {
-            handleEncapsulatedExceptions(e);
-            return 3;
         } catch (AssertionError e) {
             handleAssertionError(e);
             return 1;
-        } catch (GroupNotFoundException e) {
-            handleGroupNotFoundException(e);
-            return 1;
-        } catch (NotAGroupMemberException e) {
-            handleNotAGroupMemberException(e);
-            return 1;
-        } catch (AttachmentInvalidException e) {
-            System.err.println("Failed to add attachment: " + e.getMessage());
-            System.err.println("Aborting sending.");
-            return 1;
         } catch (DBusExecutionException e) {
-            handleDBusExecutionException(e);
+            System.err.println("Failed to send message: " + e.getMessage());
             return 1;
-        } catch (GroupIdFormatException e) {
-            handleGroupIdFormatException(e);
+        }
+
+        try {
+            long timestamp = signal.sendMessage(messageText, attachments, ns.getList("recipient"));
+            System.out.println(timestamp);
+            return 0;
+        } catch (AssertionError e) {
+            handleAssertionError(e);
             return 1;
-        } catch (InvalidNumberException e) {
-            handleInvalidNumberException(e);
+        } catch (DBusExecutionException e) {
+            System.err.println("Failed to send message: " + e.getMessage());
             return 1;
         }
     }