Fix null pointer regression

[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 7a7616bd070df653e55bb22daac6785781cb3f8c..e044f6912c9f841ba3820c1d33c3c8253e26876a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -1,31 +1,45 @@
 package org.asamk.signal.commands;
 
+import net.sourceforge.argparse4j.impl.Arguments;
 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.manager.Manager;
+import org.asamk.signal.output.OutputWriter;
 
 import java.io.IOException;
 
-public class UnregisterCommand implements LocalCommand {
+public class UnregisterCommand implements JsonRpcLocalCommand {
+
+    @Override
+    public String getName() {
+        return "unregister";
+    }
 
     @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!")
+                .action(Arguments.storeTrue());
     }
 
     @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 {
-            m.unregister();
-            return 0;
+            if (Boolean.TRUE.equals(ns.getBoolean("delete-account"))) {
+                m.deleteAccount();
+            } else {
+                m.unregister();
+            }
         } catch (IOException e) {
-            System.err.println("Unregister error: " + e.getMessage());
-            return 3;
+            throw new IOErrorException("Unregister error: " + e.getMessage(), e);
         }
     }
 }