Add CommandException to abstract cli return codes for errors

[signal-cli] / src / main / java / org / asamk / signal / commands / UpdateGroupCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
index 7251a185445dcff30e9dcb891967b8a6653a5138..204dcfe2af812e5afe06e0f3ba5fa94d018c7916 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,95 +4,76 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;

-import org.asamk.signal.manager.AttachmentInvalidException;
-import org.asamk.signal.manager.GroupNotFoundException;
-import org.asamk.signal.manager.NotAGroupMemberException;
-import org.asamk.signal.util.GroupIdFormatException;
+import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.commands.exceptions.CommandException;
+import org.asamk.signal.commands.exceptions.UnexpectedErrorException;
+import org.asamk.signal.commands.exceptions.UserErrorException;
+import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.asamk.signal.util.Util;
 import org.asamk.signal.util.Util;

-import org.whispersystems.signalservice.api.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.signalservice.api.util.InvalidNumberException;
-import org.whispersystems.util.Base64;
+import org.freedesktop.dbus.exceptions.DBusExecutionException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 
 

-import java.io.IOException;

 import java.util.ArrayList;
 import java.util.ArrayList;

+import java.util.Base64;

 import java.util.List;
 
 import java.util.List;
 

-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;
+import static org.asamk.signal.util.ErrorUtils.handleAssertionError;

 
 public class UpdateGroupCommand implements DbusCommand {
 
 
 public class UpdateGroupCommand implements DbusCommand {
 

+    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("-g", "--group")
-                .help("Specify the recipient group ID.");
-        subparser.addArgument("-n", "--name")
-                .help("Specify the new group name.");
-        subparser.addArgument("-a", "--avatar")
-                .help("Specify a new group avatar image file");
-        subparser.addArgument("-m", "--member")
-                .nargs("*")
-                .help("Specify one or more members to add to the group");
+        subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
+        subparser.addArgument("-n", "--name").help("Specify the new group name.");
+        subparser.addArgument("-a", "--avatar").help("Specify a new group avatar image file");
+        subparser.addArgument("-m", "--member").nargs("*").help("Specify one or more members to add to the group");

     }
 
     @Override
     }
 
     @Override

-    public int handleCommand(final Namespace ns, final Signal signal) {
-        if (!signal.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
+    public void handleCommand(final Namespace ns, final Signal signal) throws CommandException {
+        final var writer = new PlainTextWriterImpl(System.out);
+        byte[] groupId = null;
+        if (ns.getString("group") != null) {
+            try {
+                groupId = Util.decodeGroupId(ns.getString("group")).serialize();
+            } catch (GroupIdFormatException e) {
+                throw new UserErrorException("Invalid group id:" + e.getMessage());
+            }
+        }
+        if (groupId == null) {
+            groupId = new byte[0];
+        }
+
+        var groupName = ns.getString("name");
+        if (groupName == null) {
+            groupName = "";
+        }
+
+        List<String> groupMembers = ns.getList("member");
+        if (groupMembers == null) {
+            groupMembers = new ArrayList<>();
+        }
+
+        var groupAvatar = ns.getString("avatar");
+        if (groupAvatar == null) {
+            groupAvatar = "";

         }
 
         try {
         }
 
         try {

-            byte[] groupId = null;
-            if (ns.getString("group") != null) {
-                groupId = Util.decodeGroupId(ns.getString("group"));
-            }
-            if (groupId == null) {
-                groupId = new byte[0];
-            }
-            String groupName = ns.getString("name");
-            if (groupName == null) {
-                groupName = "";
-            }
-            List<String> groupMembers = ns.getList("member");
-            if (groupMembers == null) {
-                groupMembers = new ArrayList<>();
-            }
-            String groupAvatar = ns.getString("avatar");
-            if (groupAvatar == null) {
-                groupAvatar = "";
-            }
-            byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
+            var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);

             if (groupId.length != newGroupId.length) {
             if (groupId.length != newGroupId.length) {

-                System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
+                writer.println("Created new group: \"{}\"", Base64.getEncoder().encodeToString(newGroupId));

             }
             }

-            return 0;
-        } catch (IOException e) {
-            handleIOException(e);
-            return 3;
-        } catch (AttachmentInvalidException e) {
-            System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
-            System.err.println("Aborting sending.");
-            return 1;
-        } catch (GroupNotFoundException e) {
-            handleGroupNotFoundException(e);
-            return 1;
-        } catch (NotAGroupMemberException e) {
-            handleNotAGroupMemberException(e);
-            return 1;
-        } catch (EncapsulatedExceptions e) {
-            handleEncapsulatedExceptions(e);
-            return 3;
-        } catch (GroupIdFormatException e) {
-            handleGroupIdFormatException(e);
-            return 1;
-        } catch (InvalidNumberException e) {
-            handleInvalidNumberException(e);
-            return 1;
+        } catch (AssertionError e) {
+            handleAssertionError(e);
+            throw e;
+        } catch (Signal.Error.AttachmentInvalid e) {
+            throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
+        } catch (DBusExecutionException e) {
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());

         }
     }
 }
         }
     }
 }