X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/591c0fe8a3744608575a6dcb1f6f4f9f818948d2..03c30519b11e9772eecdc74f89d350bdecd20361:/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 4216fd9b..736190b3 100644
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,12 +4,12 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.Signal;
-import org.asamk.signal.util.GroupIdFormatException;
+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 java.util.ArrayList;
+import java.util.Base64;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
@@ -27,15 +27,10 @@ public class UpdateGroupCommand implements DbusCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {
-        if (!signal.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
         byte[] groupId = null;
         if (ns.getString("group") != null) {
             try {
-                groupId = Util.decodeGroupId(ns.getString("group"));
+                groupId = Util.decodeGroupId(ns.getString("group")).serialize();
             } catch (GroupIdFormatException e) {
                 handleGroupIdFormatException(e);
                 return 1;
@@ -63,7 +58,7 @@ public class UpdateGroupCommand implements DbusCommand {
         try {
             byte[] newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {
-                System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
+                System.out.println("Creating new group \"" + Base64.getEncoder().encodeToString(newGroupId) + "\" …");
             }
             return 0;
         } catch (AssertionError e) {
@@ -74,7 +69,7 @@ public class UpdateGroupCommand implements DbusCommand {
             return 1;
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());
-            return 1;
+            return 2;
         }
     }
 }