X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2044a7d7a58ada7ca1e67a80012e3ffdaf86c88c..d8d859ab0200318faf37ba184ea55871f8d9d2da:/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
index e609ec1e..eb218c70 100644
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -3,15 +3,14 @@ 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.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.Manager;
+import org.asamk.signal.manager.api.InvalidDeviceLinkException;
+import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.whispersystems.libsignal.InvalidKeyException;
 
 import java.io.IOException;
 import java.net.URI;
@@ -28,7 +27,7 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.help("Link another device to this device. Only works, if this is the master device.");
+        subparser.help("Link another device to this device. Only works, if this is the primary device.");
         subparser.addArgument("--uri")
                 .required(true)
                 .help("Specify the uri contained in the QR code shown by the new device.");
@@ -38,16 +37,21 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
     public void handleCommand(
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
+        final URI linkUri;
         try {
-            m.addDeviceLink(new URI(ns.getString("uri")));
+            linkUri = new URI(ns.getString("uri"));
+        } catch (URISyntaxException e) {
+            throw new UserErrorException("Device link uri has invalid format: " + e.getMessage());
+        }
+
+        try {
+            m.addDeviceLink(linkUri);
         } catch (IOException e) {
             logger.error("Add device link failed", e);
             throw new IOErrorException("Add device link failed", e);
-        } catch (URISyntaxException e) {
-            throw new UserErrorException("Device link uri has invalid format: " + e.getMessage());
-        } catch (InvalidKeyException e) {
+        } catch (InvalidDeviceLinkException e) {
             logger.error("Add device link failed", e);
-            throw new UnexpectedErrorException("Add device link failed.", e);
+            throw new UserErrorException("Add device link failed.", e);
         }
     }
 }