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 332bbe5e3cfeb9c13704c5803da131762e3d125c..fdb23ea13bad6775297913a4e9a360c2491bfda3 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UpdateGroupCommand.java
@@ -4,10 +4,14 @@ 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.PlainTextWriterImpl;

 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 import org.freedesktop.dbus.exceptions.DBusExecutionException;
 import org.asamk.signal.manager.groups.GroupIdFormatException;
 import org.asamk.signal.util.Util;
 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.Base64;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.List;


@@ -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,6 +33,7 @@ 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) {

+        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 {


@@ -58,7 +65,12 @@ public class UpdateGroupCommand implements DbusCommand {
         try {
             var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {
         try {
             var newGroupId = signal.updateGroup(groupId, groupName, groupMembers, groupAvatar);
             if (groupId.length != newGroupId.length) {

-                System.out.println("Creating new group \"" + Base64.getEncoder().encodeToString(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) {