Bump version

[signal-cli] / src / main / java / org / asamk / signal / util / ErrorUtils.java

diff --git a/src/main/java/org/asamk/signal/util/ErrorUtils.java b/src/main/java/org/asamk/signal/util/ErrorUtils.java
index e245492588f751ef82d2b967f44c6b5bb955f0cc..e40ed2183fc54f39ef71c585aa2bda600b9a7048 100644 (file)
--- a/src/main/java/org/asamk/signal/util/ErrorUtils.java
+++ b/src/main/java/org/asamk/signal/util/ErrorUtils.java
@@ -58,20 +58,14 @@ public class ErrorUtils {
 
     public static String getErrorMessageFromSendMessageResult(SendMessageResult result) {
         var identifier = getLegacyIdentifier(result.getAddress());
-        if (result.isNetworkFailure()) {
-            return String.format("Network failure for \"%s\"", identifier);
-        } else if (result.isUnregisteredFailure()) {
-            return String.format("Unregistered user \"%s\"", identifier);
-        } else if (result.getIdentityFailure() != null) {
-            return String.format("Untrusted Identity for \"%s\"", identifier);
-        } else if (result.getProofRequiredFailure() != null) {
+        if (result.getProofRequiredFailure() != null) {
             final var failure = result.getProofRequiredFailure();
             return String.format(
                     "CAPTCHA proof required for sending to \"%s\", available options \"%s\" with challenge token \"%s\", or wait \"%d\" seconds.\n"
                             + (
                             failure.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)
                                     ?
-                                    "To get the captcha token, go to https://signalcaptchas.org/registration/generate.html\n"
+                                    "To get the captcha token, go to https://signalcaptchas.org/challenge/generate.html\n"
                                             + "Check the developer tools (F12) console for a failed redirect to signalcaptcha://\n"
                                             + "Everything after signalcaptcha:// is the captcha token.\n"
                                             + "Use the following command to submit the captcha token:\n"
@@ -85,6 +79,12 @@ public class ErrorUtils {
                             .collect(Collectors.joining(", ")),
                     failure.getToken(),
                     failure.getRetryAfterSeconds());
+        } else if (result.isNetworkFailure()) {
+            return String.format("Network failure for \"%s\"", identifier);
+        } else if (result.isUnregisteredFailure()) {
+            return String.format("Unregistered user \"%s\"", identifier);
+        } else if (result.getIdentityFailure() != null) {
+            return String.format("Untrusted Identity for \"%s\"", identifier);
         }
         return null;
     }