Move storage package to manager

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

diff --git a/src/main/java/org/asamk/signal/commands/RegisterCommand.java b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
index 2e2b7c4f56a090cb3ab5785c20cc39faffa7b6d5..f69e0844b8673650c91dd2398414c8731b49c022 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -5,6 +5,7 @@ import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
 import org.asamk.signal.manager.Manager;
+import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
 
 import java.io.IOException;
 
@@ -15,13 +16,20 @@ public class RegisterCommand implements LocalCommand {
         subparser.addArgument("-v", "--voice")
                 .help("The verification should be done over voice, not sms.")
                 .action(Arguments.storeTrue());
+        subparser.addArgument("--captcha")
+                .help("The captcha token, required if registration failed with a captcha required error.");
     }
 
     @Override
     public int handleCommand(final Namespace ns, final Manager m) {
         try {
-            m.register(ns.getBoolean("voice"));
+            final boolean voiceVerification = ns.getBoolean("voice");
+            final String captcha = ns.getString("captcha");
+            m.register(voiceVerification, captcha);
             return 0;
+        } catch (CaptchaRequiredException e) {
+            System.err.println("Captcha invalid or required for verification (" + e.getMessage() + ")");
+            return 1;
         } catch (IOException e) {
             System.err.println("Request verify error: " + e.getMessage());
             return 3;