Use PlainTextWriter for all cli stdout output

[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 4216fd9baad30013257dcd6295f2458e7882006c..fdb23ea13bad6775297913a4e9a360c2491bfda3 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,16 @@ 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.util.GroupIdFormatException;
+import org.asamk.signal.PlainTextWriterImpl;
+import org.asamk.signal.manager.groups.GroupIdFormatException;

 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 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.io.IOException;

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

+import java.util.Base64;

 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 import java.util.List;
 
 import static org.asamk.signal.util.ErrorUtils.handleAssertionError;


@@ -17,6 +21,8 @@ import static org.asamk.signal.util.ErrorUtils.handleGroupIdFormatException;
 
 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) {
         subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.addArgument("-g", "--group").help("Specify the recipient group ID.");


@@ -27,15 +33,11 @@ public class UpdateGroupCommand implements DbusCommand {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {
 
     @Override
     public int handleCommand(final Namespace ns, final Signal signal) {

-        if (!signal.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
-
+        final var writer = new PlainTextWriterImpl(System.out);

         byte[] groupId = null;
         if (ns.getString("group") != null) {
             try {
         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;
             } catch (GroupIdFormatException e) {
                 handleGroupIdFormatException(e);
                 return 1;


@@ -45,7 +47,7 @@ public class UpdateGroupCommand implements DbusCommand {
             groupId = new byte[0];
         }
 
             groupId = new byte[0];
         }
 

-        String groupName = ns.getString("name");
+        var groupName = ns.getString("name");

         if (groupName == null) {
             groupName = "";
         }
         if (groupName == null) {
             groupName = "";
         }


@@ -55,15 +57,20 @@ public class UpdateGroupCommand implements DbusCommand {
             groupMembers = new ArrayList<>();
         }
 
             groupMembers = new ArrayList<>();
         }
 

-        String groupAvatar = ns.getString("avatar");
+        var groupAvatar = ns.getString("avatar");

         if (groupAvatar == null) {
             groupAvatar = "";
         }
 
         try {
         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) {
             if (groupId.length != newGroupId.length) {

-                System.out.println("Creating new group \"" + Base64.encodeBytes(newGroupId) + "\" …");
+                try {
+                    writer.println("Creating new group \"{}\" …", Base64.getEncoder().encodeToString(newGroupId));
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    return 3;
+                }

             }
             return 0;
         } catch (AssertionError e) {
             }
             return 0;
         } catch (AssertionError e) {


@@ -74,7 +81,7 @@ public class UpdateGroupCommand implements DbusCommand {
             return 1;
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());
             return 1;
         } catch (DBusExecutionException e) {
             System.err.println("Failed to send message: " + e.getMessage());

-            return 1;
+            return 2;

         }
     }
 }
         }
     }
 }