Use Java 17

[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 a4c613afc09a0e78c525eebf8665aeb21203220f..7e4fe505978ef78017070b7ca866687c5e32e662 100644 (file)
--- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java
+++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java
@@ -14,10 +14,16 @@ import java.io.IOException;
 
 public class RegisterCommand implements RegistrationCommand {
 
 
 public class RegisterCommand implements RegistrationCommand {
 

+    @Override
+    public String getName() {
+        return "register";
+    }
+

     @Override
     public void attachToSubparser(final Subparser subparser) {
     @Override
     public void attachToSubparser(final Subparser subparser) {

+        subparser.help("Register a phone number with SMS or voice verification.");

         subparser.addArgument("-v", "--voice")
         subparser.addArgument("-v", "--voice")

-                .help("The verification should be done over voice, not sms.")
+                .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.");
                 .action(Arguments.storeTrue());
         subparser.addArgument("--captcha")
                 .help("The captcha token, required if registration failed with a captcha required error.");


@@ -25,24 +31,26 @@ public class RegisterCommand implements RegistrationCommand {
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {
 
     @Override
     public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException {

-        final boolean voiceVerification = ns.getBoolean("voice");
-        final var captcha = ns.getString("captcha");
+        final boolean voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice"));
+        final var captchaString = ns.getString("captcha");
+        final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", "");

 
         try {
             m.register(voiceVerification, captcha);
         } catch (CaptchaRequiredException e) {
             String message;
             if (captcha == null) {
 
         try {
             m.register(voiceVerification, captcha);
         } catch (CaptchaRequiredException e) {
             String message;
             if (captcha == null) {

-                message = "Captcha required for verification, use --captcha CAPTCHA\n"
-                        + "To get the token, go to https://signalcaptchas.org/registration/generate.html\n"
-                        + "Check the developer tools (F12) console for a failed redirect to signalcaptcha://\n"
-                        + "Everything after signalcaptcha:// is the captcha token.";
+                message = """
+                        Captcha required for verification, use --captcha CAPTCHA
+                        To get the token, go to https://signalcaptchas.org/registration/generate.html
+                        Check the developer tools (F12) console for a failed redirect to signalcaptcha://
+                        Everything after signalcaptcha:// is the captcha token.""";

             } else {
                 message = "Invalid captcha given.";
             }
             throw new UserErrorException(message);
         } catch (IOException e) {
             } else {
                 message = "Invalid captcha given.";
             }
             throw new UserErrorException(message);
         } catch (IOException e) {

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

         }
     }
 }
         }
     }
 }