Merge branch 'master' into dbus_sendviewed

[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 c8c754acb17123311cb7ca816b08d3217e9a811e..68a203752bd4edc56bfac19f778b586dabe4b927 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -13,10 +13,13 @@ import java.io.IOException;
 
 public class UnregisterCommand implements LocalCommand {
 
-    public UnregisterCommand(final OutputWriter outputWriter) {
+    @Override
+    public String getName() {
+        return "unregister";
     }
 
-    public static void attachToSubparser(final Subparser subparser) {
+    @Override
+    public void attachToSubparser(final Subparser subparser) {
         subparser.help("Unregister the current device from the signal server.");
         subparser.addArgument("--delete-account")
                 .help("Delete account completely from server. CAUTION: Only do this if you won't use this number again!")
@@ -24,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);
         }
     }
 }