X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/15e802971524cc061b72a1c5335140f517dd8f03..6f5e72119e0c996f1efefecda11e33422d44a171:/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 f117436c..1d697299 100644
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -19,19 +19,22 @@ import java.util.concurrent.TimeoutException;
 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
-    public void handleCommand(final Namespace ns, final ProvisioningManager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final ProvisioningManager m, final OutputWriter outputWriter
+    ) throws CommandException {
         final var writer = (PlainTextWriter) outputWriter;
 
         var deviceName = ns.getString("name");
@@ -41,15 +44,15 @@ public class LinkCommand implements ProvisioningCommand {
         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) {
-            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 "
-                    + e.getUsername()
+                    + e.getNumber()
                     + " already exists\nDelete \""
                     + e.getFileName()
                     + "\" before trying again.");