Handle rate limit exception correctly when querying usernames

[signal-cli] / 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 24c4ea9127b6d239c17eb4beb005d7be33cb2c24..43e1a0b761d14745ccc995bf0fc65c06e2285ba4 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -7,7 +7,10 @@ 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.Manager;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.manager.api.DeviceLimitExceededException;
+import org.asamk.signal.manager.api.DeviceLinkUrl;

 import org.asamk.signal.manager.api.InvalidDeviceLinkException;
 import org.asamk.signal.manager.api.InvalidDeviceLinkException;

+import org.asamk.signal.manager.api.NotPrimaryDeviceException;

 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.asamk.signal.output.OutputWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;


@@ -18,7 +21,7 @@ import java.net.URISyntaxException;
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 
 
 public class AddDeviceCommand implements JsonRpcLocalCommand {
 

-    private final static Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);
+    private static final Logger logger = LoggerFactory.getLogger(AddDeviceCommand.class);

 
     @Override
     public String getName() {
 
     @Override
     public String getName() {


@@ -27,7 +30,7 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
 
     @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.");
         subparser.addArgument("--uri")
                 .required(true)
                 .help("Specify the uri contained in the QR code shown by the new device.");


@@ -35,7 +38,9 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
 
     @Override
     public void handleCommand(
 
     @Override
     public void handleCommand(

-            final Namespace ns, final Manager m, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter

     ) throws CommandException {
         final URI linkUri;
         try {
     ) throws CommandException {
         final URI linkUri;
         try {


@@ -45,13 +50,18 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
         }
 
         try {
         }
 
         try {

-            m.addDeviceLink(linkUri);
+            var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
+            m.addDeviceLink(deviceLinkUrl);

         } catch (IOException e) {
         } catch (IOException e) {

-            logger.error("Add device link failed", e);
+            logger.error("Add device link failed: {}", e.getMessage());

             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {
             throw new IOErrorException("Add device link failed", e);
         } catch (InvalidDeviceLinkException e) {

-            logger.error("Add device link failed", e);
-            throw new UserErrorException("Add device link failed.", e);
+            logger.info("Invalid device link");
+            throw new UserErrorException("Invalid device link", e);
+        } catch (DeviceLimitExceededException e) {
+            throw new UserErrorException("Account has too many linked devices already", e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");

         }
     }
 }
         }
     }
 }