Extend getUserStatus command for usernames

[signal-cli] / src / main / java / org / asamk / signal / commands / RemoveDeviceCommand.java

diff --git a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
index 1f47e2b30486a39a4cbb04f5ced8103816dd72eb..68a53616232b77d7d689c0c0bc4406e3cd9a6c75 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -3,10 +3,12 @@ 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.UserErrorException;
 import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.api.NotPrimaryDeviceException;
+import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
 
@@ -31,10 +33,12 @@ public class RemoveDeviceCommand implements JsonRpcLocalCommand {
             final Namespace ns, final Manager m, final OutputWriter outputWriter
     ) throws CommandException {
         try {
-            int deviceId = ns.getInt("device-id");
+            final var deviceId = ns.getInt("device-id");
             m.removeLinkedDevices(deviceId);
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (IOException e) {
-            throw new IOErrorException("Error while removing device: " + e.getMessage());
+            throw new IOErrorException("Error while removing device: " + e.getMessage(), e);
         }
     }
 }