Use PlainTextWriter for all cli stdout output

[signal-cli] / src / main / java / org / asamk / signal / commands / LinkCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/LinkCommand.java b/src/main/java/org/asamk/signal/commands/LinkCommand.java
index 45f59082f7fbc748b25f0529b888f7c5b3122bc0..fe580916a1e9691c74fb9f618fb33368f5454712 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -3,8 +3,11 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 

+import org.asamk.signal.PlainTextWriterImpl;

 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.UserAlreadyExists;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.UserAlreadyExists;

+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;

 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;
 import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;


@@ -14,22 +17,25 @@ import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
 
 public class LinkCommand implements ProvisioningCommand {
 
 
 public class LinkCommand implements ProvisioningCommand {
 

+    private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @Override
     public void attachToSubparser(final Subparser subparser) {

-        subparser.addArgument("-n", "--name")
-                .help("Specify a name to describe this new device.");
+        subparser.addArgument("-n", "--name").help("Specify a name to describe this new device.");

     }
 
     @Override
     public int handleCommand(final Namespace ns, final ProvisioningManager m) {
     }
 
     @Override
     public int handleCommand(final Namespace ns, final ProvisioningManager m) {

-        String deviceName = ns.getString("name");
+        final var writer = new PlainTextWriterImpl(System.out);
+
+        var deviceName = ns.getString("name");

         if (deviceName == null) {
             deviceName = "cli";
         }
         try {
         if (deviceName == null) {
             deviceName = "cli";
         }
         try {

-            System.out.println(m.getDeviceLinkUri());
-            String username = m.finishDeviceLink(deviceName);
-            System.out.println("Associated with: " + username);
+            writer.println("{}", m.getDeviceLinkUri());
+            var username = m.finishDeviceLink(deviceName);
+            writer.println("Associated with: {}", username);

         } catch (TimeoutException e) {
             System.err.println("Link request timed out, please try again.");
             return 3;
         } catch (TimeoutException e) {
             System.err.println("Link request timed out, please try again.");
             return 3;


@@ -43,7 +49,11 @@ public class LinkCommand implements ProvisioningCommand {
             e.printStackTrace();
             return 2;
         } catch (UserAlreadyExists e) {
             e.printStackTrace();
             return 2;
         } catch (UserAlreadyExists e) {

-            System.err.println("The user " + e.getUsername() + " already exists\nDelete \"" + e.getFileName() + "\" before trying again.");
+            System.err.println("The user "
+                    + e.getUsername()
+                    + " already exists\nDelete \""
+                    + e.getFileName()
+                    + "\" before trying again.");

             return 1;
         }
         return 0;
             return 1;
         }
         return 0;