Show better error message when using addDevice on a linked device

[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 0895601a452143cfa5d3e91e9394f600587ce98b..47cf87485c32a3bec5fc27c1ff1ea5419f60268e 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/AddDeviceCommand.java
@@ -9,6 +9,7 @@ import org.asamk.signal.commands.exceptions.UserErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.manager.api.DeviceLinkUrl;
 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;
@@ -49,11 +50,13 @@ public class AddDeviceCommand implements JsonRpcLocalCommand {
             var deviceLinkUrl = DeviceLinkUrl.parseDeviceLinkUri(linkUri);
             m.addDeviceLink(deviceLinkUrl);
         } 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) {
-            logger.error("Add device link failed", e);
-            throw new UserErrorException("Add device link failed.", e);
+            logger.error("Invalid device link");
+            throw new UserErrorException("Invalid device link", e);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         }
     }
 }