Removing linked devices only works on the primary device

[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 9f5787aecd1f76f2702cad8fc25288c0c02ba93e..68a53616232b77d7d689c0c0bc4406e3cd9a6c75 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -2,33 +2,43 @@ package org.asamk.signal.commands;
 
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
+
+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;
 
-public class RemoveDeviceCommand implements LocalCommand {
+public class RemoveDeviceCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "removeDevice";
+    }
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
-        subparser.addArgument("-d", "--deviceId")
+        subparser.help("Remove a linked device.");
+        subparser.addArgument("-d", "--device-id", "--deviceId")
                 .type(int.class)
                 .required(true)
                 .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
-        if (!m.isRegistered()) {
-            System.err.println("User is not registered.");
-            return 1;
-        }
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {
         try {
-            int deviceId = ns.getInt("deviceId");
+            final var deviceId = ns.getInt("device-id");
             m.removeLinkedDevices(deviceId);
-            return 0;
+        } catch (NotPrimaryDeviceException e) {
+            throw new UserErrorException("This command doesn't work on linked devices.");
         } catch (IOException e) {
-            e.printStackTrace();
-            return 3;
+            throw new IOErrorException("Error while removing device: " + e.getMessage(), e);
         }
     }
 }