Update gradle

[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 1846eba17b980104986b5b5349a95461c7e6c41b..e044f6912c9f841ba3820c1d33c3c8253e26876a 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/UnregisterCommand.java
@@ -1,27 +1,45 @@
 package org.asamk.signal.commands;
 
 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 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;
 
 
 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.");
 
     @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
     }
 
     @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 {
         try {

-            m.unregister();
+            if (Boolean.TRUE.equals(ns.getBoolean("delete-account"))) {
+                m.deleteAccount();
+            } else {
+                m.unregister();
+            }

         } catch (IOException e) {
         } catch (IOException e) {

-            throw new IOErrorException("Unregister error: " + e.getMessage());
+            throw new IOErrorException("Unregister error: " + e.getMessage(), e);

         }
     }
 }
         }
     }
 }