Remove workaround for getBoolean from JsonRpcLocalCommand

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

diff --git a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
index 72df842e34b69a3fa05b4e7ff1ef2320e3805c85..68a203752bd4edc56bfac19f778b586dabe4b927 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -4,6 +4,7 @@ import net.sourceforge.argparse4j.impl.Arguments;
 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.manager.Manager;
@@ -12,6 +13,11 @@ import java.io.IOException;
 
 public class UnregisterCommand implements LocalCommand {
 
+    @Override
+    public String getName() {
+        return "unregister";
+    }
+
     @Override
     public void attachToSubparser(final Subparser subparser) {
         subparser.help("Unregister the current device from the signal server.");
@@ -21,16 +27,17 @@ public class UnregisterCommand implements LocalCommand {
     }
 
     @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 {
-            if (ns.getBoolean("delete_account")) {
+            if (Boolean.TRUE.equals(ns.getBoolean("delete-account"))) {
                 m.deleteAccount();
             } else {
                 m.unregister();
             }
         } catch (IOException e) {
-            e.printStackTrace();
-            throw new IOErrorException("Unregister error: " + e.getMessage());
+            throw new IOErrorException("Unregister error: " + e.getMessage(), e);
         }
     }
 }