X-Git-Url: https://git.nmode.ca/signal-cli/blobdiff_plain/2044a7d7a58ada7ca1e67a80012e3ffdaf86c88c..2ab42ca5471e8fc1e1a31cde954e19564178f114:/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 96530889..da72e1a4 100644 --- a/src/main/java/org/asamk/signal/commands/RegisterCommand.java +++ b/src/main/java/org/asamk/signal/commands/RegisterCommand.java @@ -8,7 +8,7 @@ import org.asamk.signal.commands.exceptions.CommandException; import org.asamk.signal.commands.exceptions.IOErrorException; import org.asamk.signal.commands.exceptions.UserErrorException; import org.asamk.signal.manager.RegistrationManager; -import org.whispersystems.signalservice.api.push.exceptions.CaptchaRequiredException; +import org.asamk.signal.manager.api.CaptchaRequiredException; import java.io.IOException; @@ -31,7 +31,7 @@ public class RegisterCommand implements RegistrationCommand { @Override public void handleCommand(final Namespace ns, final RegistrationManager m) throws CommandException { - final boolean voiceVerification = ns.getBoolean("voice"); + final boolean voiceVerification = Boolean.TRUE.equals(ns.getBoolean("voice")); final var captchaString = ns.getString("captcha"); final var captcha = captchaString == null ? null : captchaString.replace("signalcaptcha://", ""); @@ -40,10 +40,11 @@ public class RegisterCommand implements RegistrationCommand { } 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."; }