Add simplification for single recipient reactions

[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 4fcad79df52dcf5efffdf457da52e024cb3096a3..eab0a6bed0fc20cd60c5671119f0a8f4e9793bbf 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 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.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.Manager;

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

 
 import java.io.IOException;
 
 
 import java.io.IOException;
 


@@ -21,18 +23,22 @@ public class RemoveDeviceCommand implements JsonRpcLocalCommand {
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Remove a linked device.");
         subparser.addArgument("-d", "--device-id", "--deviceId")
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Remove a linked device.");
         subparser.addArgument("-d", "--device-id", "--deviceId")

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

                 .required(true)
                 .help("Specify the device you want to remove. Use listDevices to see the deviceIds.");
     }
 
     @Override
     public void handleCommand(
                 .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, final OutputWriter outputWriter
+            final Namespace ns,
+            final Manager m,
+            final OutputWriter outputWriter

     ) throws CommandException {
         try {
     ) throws CommandException {
         try {

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

             m.removeLinkedDevices(deviceId);
             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(), e);
         }
         } catch (IOException e) {
             throw new IOErrorException("Error while removing device: " + e.getMessage(), e);
         }