Fix null pointer regression

[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 f117436c913874f247cb4b1267749ab7b0a134c8..7c29a3a9eeb79e678329c979d580d3f6b84a93b4 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -3,13 +3,13 @@ package org.asamk.signal.commands;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-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.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;
 
@@ -18,20 +18,25 @@ import java.util.concurrent.TimeoutException;
 
 public class LinkCommand implements ProvisioningCommand {
 
-    private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
-    private final OutputWriter outputWriter;
+    private static final Logger logger = LoggerFactory.getLogger(LinkCommand.class);
 
-    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");
@@ -40,16 +45,15 @@ public class LinkCommand implements ProvisioningCommand {
         }
         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) {
-            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 "
-                    + e.getUsername()
+                    + e.getNumber()
                     + " already exists\nDelete \""
                     + e.getFileName()
                     + "\" before trying again.");