Add Pair record

[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 ae496758aa308c0fe3ba0c5acb88a05984835dab..1d697299dc950657a350f198c1b43b08de02b940 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -4,7 +4,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputWriter;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.OutputWriter;

-import org.asamk.signal.PlainTextWriterImpl;
+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.UserErrorException;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;


@@ -19,20 +19,23 @@ import java.util.concurrent.TimeoutException;
 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);

-    private final OutputWriter outputWriter;

 
 

-    public LinkCommand(final OutputWriter outputWriter) {
-        this.outputWriter = outputWriter;
+    @Override
+    public String getName() {
+        return "link";

     }
 
     }
 

-    public static 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.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

-    public void handleCommand(final Namespace ns, final ProvisioningManager m) throws CommandException {
-        final var writer = (PlainTextWriterImpl) outputWriter;
+    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) {


@@ -41,15 +44,15 @@ public class LinkCommand implements ProvisioningCommand {
         try {
             writer.println("{}", m.getDeviceLinkUri());
             try (var manager = m.finishDeviceLink(deviceName)) {
         try {
             writer.println("{}", m.getDeviceLinkUri());
             try (var manager = m.finishDeviceLink(deviceName)) {

-                writer.println("Associated with: {}", manager.getUsername());
+                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());
+            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.");