X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/fc76c9badf720c647aef99f6a9390111dc68e0ef..05abb3f9f6294677d2de97a9d88c8e9de04c10ec:/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 b5da274e..204dcfe2 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,19 +4,26 @@ 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.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.freedesktop.dbus.exceptions.DBusExecutionException;
-import org.whispersystems.util.Base64;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
 
 public class UpdateGroupCommand implements DbusCommand {
 
+    private final static Logger logger = LoggerFactory.getLogger(UpdateGroupCommand.class);
+
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
@@ -26,21 +33,21 @@ public class UpdateGroupCommand implements DbusCommand {
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Signal signal) {
+    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) {
-                handleGroupIdFormatException(e);
-                return 1;
+                throw new UserErrorException("Invalid group id:" + e.getMessage());
             }
         }
         if (groupId == null) {
             groupId = new byte[0];
         }
 
-        String groupName = ns.getString("name");
+        var groupName = ns.getString("name");
         if (groupName == null) {
             groupName = "";
         }
@@ -50,26 +57,23 @@ public class UpdateGroupCommand implements DbusCommand {
             groupMembers = new ArrayList<>();
         }
 
-        String groupAvatar = ns.getString("avatar");
+        var groupAvatar = ns.getString("avatar");
         if (groupAvatar == null) {
             groupAvatar = "";
         }
 
         try {
-            byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
+            var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             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 (AssertionError e) {
             handleAssertionError(e);
-            return 1;
+            throw e;
         } catch (Signal.Error.AttachmentInvalid e) {
-            System.err.println("Failed to add avatar attachment for group\": " + e.getMessage());
-            return 1;
+            throw new UserErrorException("Failed to add avatar attachment for group\": " + e.getMessage());
         } catch (DBusExecutionException e) {
-            System.err.println("Failed to send message: " + e.getMessage());
-            return 1;
+            throw new UnexpectedErrorException("Failed to send message: " + e.getMessage());
         }
     }
 }