Clean up base package

[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 4de93c4523ccd564d25e75c0bed0637b8ca25b61..f2012e774668579d10ad5d52219ffb104264f62c 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RemoveDeviceCommand.java
@@ -6,27 +6,35 @@ import net.sourceforge.argparse4j.inf.Subparser;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;
 import org.asamk.signal.commands.exceptions.CommandException;
 import org.asamk.signal.commands.exceptions.IOErrorException;
 import org.asamk.signal.manager.Manager;

+import org.asamk.signal.output.OutputWriter;

 
 import java.io.IOException;
 
 
 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.help("Remove a linked device.");
         subparser.addArgument("-d", "--device-id", "--deviceId")
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Remove a linked device.");
         subparser.addArgument("-d", "--device-id", "--deviceId")

-                .type(int.class)
+                .type(long.class)

                 .required(true)
                 .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
     }
 
     @Override
                 .required(true)
                 .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
     }
 
     @Override

-    public void handleCommand(final Namespace ns, final Manager m) throws CommandException {
+    public void handleCommand(
+            final Namespace ns, final Manager m, final OutputWriter outputWriter
+    ) throws CommandException {

         try {
         try {

-            int deviceId = ns.getInt("device-id");
+            final var deviceId = ns.getLong("device-id");

             m.removeLinkedDevices(deviceId);
         } catch (IOException e) {
             m.removeLinkedDevices(deviceId);
         } catch (IOException e) {

-            throw new IOErrorException("Error while removing device: " + e.getMessage());
+            throw new IOErrorException("Error while removing device: " + e.getMessage(), e);

         }
     }
 }
         }
     }
 }