X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/f60a10eb6e40921c32045c1e38843d6b87f3d274..0091c1cf266de225f84d507bb473ac22582d3b15:/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 3830abe6..72df842e 100644
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -1,7 +1,11 @@
 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 java.io.IOException;
@@ -11,20 +15,22 @@ public class UnregisterCommand implements LocalCommand {
     @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) throws CommandException {
         try {
-            m.unregister();
-            return 0;
+            if (ns.getBoolean("delete_account")) {
+                m.deleteAccount();
+            } else {
+                m.unregister();
+            }
         } catch (IOException e) {
-            System.err.println("Unregister error: " + e.getMessage());
-            return 3;
+            e.printStackTrace();
+            throw new IOErrorException("Unregister error: " + e.getMessage());
         }
     }
 }