Use improved shutdown for daemon command

[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 88493d3f73a482eff7a0e47401499a4e36016a5c..f49e0c24c9d18e2a84c402a7588127556bb6c7bc 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -3,12 +3,13 @@ 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.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.ProvisioningManager;

-import org.asamk.signal.manager.UserAlreadyExists;
+import org.asamk.signal.manager.api.UserAlreadyExistsException;
+import org.asamk.signal.output.OutputWriter;
+import org.asamk.signal.output.PlainTextWriter;

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


@@ -19,6 +20,11 @@ public class LinkCommand implements ProvisioningCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
 
 
     private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
 

+    @Override
+    public String getName() {
+        return "link";
+    }
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Link to an existing device, instead of registering a new number.");
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Link to an existing device, instead of registering a new number.");


@@ -26,8 +32,10 @@ public class LinkCommand implements ProvisioningCommand {
     }
 
     @Override
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final ProvisioningManager m) throws CommandException {
-        final var writer = new PlainTextWriterImpl(System.out);
+    public void handleCommand(
+            final Namespace ns, final ProvisioningManager m, final OutputWriter outputWriter
+    ) throws CommandException {
+        final var writer = (PlainTextWriter) outputWriter;

 
         var deviceName = ns.getString("name");
         if (deviceName == null) {
 
         var deviceName = ns.getString("name");
         if (deviceName == null) {


@@ -35,16 +43,15 @@ public class LinkCommand implements ProvisioningCommand {
         }
         try {
             writer.println("{}", m.getDeviceLinkUri());
         }
         try {
             writer.println("{}", m.getDeviceLinkUri());

-            try (var manager = m.finishDeviceLink(deviceName)) {
-                writer.println("Associated with: {}", manager.getUsername());
-            }
+            var number = m.finishDeviceLink(deviceName);
+            writer.println("Associated with: {}", number);

         } catch (TimeoutException e) {
             throw new UserErrorException("Link request timed out, please try again.");
         } catch (IOException e) {
         } catch (TimeoutException e) {
             throw new UserErrorException("Link request timed out, please try again.");
         } catch (IOException e) {

-            throw new IOErrorException("Link request error: " + e.getMessage());
-        } catch (UserAlreadyExists e) {
+            throw new IOErrorException("Link request error: " + e.getMessage(), e);
+        } catch (UserAlreadyExistsException e) {

             throw new UserErrorException("The user "
             throw new UserErrorException("The user "

-                    + e.getUsername()
+                    + e.getNumber()

                     + " already exists\nDelete \""
                     + e.getFileName()
                     + "\" before trying again.");
                     + " already exists\nDelete \""
                     + e.getFileName()
                     + "\" before trying again.");