Refactor dbus client mode to improve maintainability

[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 34775773069b3b79069830374969c4c7aeaacce5..1d697299dc950657a350f198c1b43b08de02b940 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -3,34 +3,39 @@ 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.OutputWriter;
+import org.asamk.signal.PlainTextWriter;

 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;

-import org.asamk.signal.commands.exceptions.UnexpectedErrorException;

 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.ProvisioningManager;
 import org.asamk.signal.manager.UserAlreadyExists;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 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 java.util.concurrent.TimeoutException;
 
 
 import java.io.IOException;
 import java.util.concurrent.TimeoutException;
 

-import static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-

 public class LinkCommand implements ProvisioningCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
 
 public class LinkCommand implements ProvisioningCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
 

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

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

+        subparser.help("Link to an existing device, instead of registering a new number.");

         subparser.addArgument("-n", "--name").help("Specify a name to describe this new device.");
     }
 
     @Override
         subparser.addArgument("-n", "--name").help("Specify a name to describe this new device.");
     }
 
     @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) {


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

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

         } 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 (AssertionError e) {
-            handleAssertionError(e);
-            throw e;
-        } catch (InvalidKeyException e) {
-            logger.debug("Finish device link failed", e);
-            throw new UnexpectedErrorException("Invalid key: " + e.getMessage());
+            throw new IOErrorException("Link request error: " + e.getMessage(), e);

         } catch (UserAlreadyExists e) {
             throw new UserErrorException("The user "
         } catch (UserAlreadyExists e) {
             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.");