Add more information for CaptchaRequiredException

[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 f69e0844b8673650c91dd2398414c8731b49c022..f7736018048c51f01c8849a575674479d2ae3b4b 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -4,12 +4,12 @@ import net.sourceforge.argparse4j.impl.Arguments;
 import net.sourceforge.argparse4j.inf.Namespace;
 import net.sourceforge.argparse4j.inf.Subparser;
 
-import org.asamk.signal.manager.Manager;
+import org.asamk.signal.manager.RegistrationManager;
 import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException;
 
 import java.io.IOException;
 
-public class RegisterCommand implements LocalCommand {
+public class RegisterCommand implements RegistrationCommand {
 
     @Override
     public void attachToSubparser(final Subparser subparser) {
@@ -21,14 +21,22 @@ public class RegisterCommand implements LocalCommand {
     }
 
     @Override
-    public int handleCommand(final Namespace ns, final Manager m) {
+    public int handleCommand(final Namespace ns, final RegistrationManager m) {
+        final boolean voiceVerification = ns.getBoolean("voice");
+        final String captcha = ns.getString("captcha");
+
         try {
-            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() + ")");
+            if (captcha == null) {
+                System.err.println("Captcha required for verification, use --captcha CAPTCHA");
+                System.err.println("To get the token, go to https://signalcaptchas.org/registration/generate.html");
+                System.err.println("Check the developer tools (F12) console for a failed redirect to signalcaptcha://");
+                System.err.println("Everything after signalcaptcha:// is the captcha token.");
+            } else {
+                System.err.println("Invalid captcha given.");
+            }
             return 1;
         } catch (IOException e) {
             System.err.println("Request verify error: " + e.getMessage());