Replace Base64 class from libsignal with java.util.Base64

[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 925b8c905daacf0ce54dad640cf69153e1806b9f..de8564f05a83eabac586bdfbd568b731ee8e08fc 100644 (file)
--- 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;
@@ -19,28 +19,18 @@ public class UpdateGroupCommand implements DbusCommand {
 
     @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
     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;
@@ -68,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) {