X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/c6395b9f35a4229d297aef063597bc96919a7f36..8e8eed7b061f1ed47cf9e30abb5e29ee08e3a3dc:/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 fe580916..4090e9ec 100644
--- a/src/main/java/org/asamk/signal/commands/LinkCommand.java
+++ b/src/main/java/org/asamk/signal/commands/LinkCommand.java
@@ -4,17 +4,17 @@ 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.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 static org.asamk.signal.util.ErrorUtils.handleAssertionError;
-
 public class LinkCommand implements ProvisioningCommand {
 
     private final static Logger logger = LoggerFactory.getLogger(LinkCommand.class);
@@ -25,7 +25,7 @@ public class LinkCommand implements ProvisioningCommand {
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final ProvisioningManager m) {
+    public void handleCommand(final Namespace ns, final ProvisioningManager m) throws CommandException {
         final var writer = new PlainTextWriterImpl(System.out);
 
         var deviceName = ns.getString("name");
@@ -34,28 +34,19 @@ public class LinkCommand implements ProvisioningCommand {
         }
         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.getUsername());
+            }
         } catch (TimeoutException e) {
-            System.err.println("Link request timed out, please try again.");
-            return 3;
+            throw new UserErrorException("Link request timed out, please try again.");
         } catch (IOException e) {
-            System.err.println("Link request error: " + e.getMessage());
-            return 3;
-        } catch (AssertionError e) {
-            handleAssertionError(e);
-            return 1;
-        } catch (InvalidKeyException e) {
-            e.printStackTrace();
-            return 2;
+            throw new IOErrorException("Link request error: " + e.getMessage());
         } catch (UserAlreadyExists e) {
-            System.err.println("The user "
+            throw new UserErrorException("The user "
                     + e.getUsername()
                     + " already exists\nDelete \""
                     + e.getFileName()
                     + "\" before trying again.");
-            return 1;
         }
-        return 0;
     }
 }