From 02629020df26eed264df9cd72a5d24b1e3af8704 Mon Sep 17 00:00:00 2001 From: Chris Eager <79161849+eager-signal@users.noreply.github.com> Date: Tue, 25 Jun 2024 11:16:09 -0500 Subject: [PATCH] Remove Option.RECAPTCHA from ProofRequiredException. --- .../org/thoughtcrime/securesms/jobs/PushSendJob.java | 9 ++------- .../api/push/exceptions/ProofRequiredException.java | 4 +--- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java index 7d8856fcac..07cf66e5bb 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java @@ -602,13 +602,8 @@ public abstract class PushSendJob extends SendJob { SignalDatabase.messages().markAsRateLimited(messageId); } - final Optional captchaRequired = - proofRequired.getOptions().stream() - .filter(option -> option.equals(ProofRequiredException.Option.RECAPTCHA) || option.equals(ProofRequiredException.Option.CAPTCHA)) - .findFirst(); - - if (captchaRequired.isPresent()) { - Log.i(TAG, "[Proof Required] " + captchaRequired.get() + " required."); + if (proofRequired.getOptions().contains(ProofRequiredException.Option.CAPTCHA)) { + Log.i(TAG, "[Proof Required] CAPTCHA required."); SignalStore.rateLimit().markNeedsRecaptcha(proofRequired.getToken()); if (recipient != null) { diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java index ac5526d2be..32bb56e623 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java @@ -42,8 +42,6 @@ public class ProofRequiredException extends NonSuccessfulResponseCodeException { for (String raw : rawOptions) { switch (raw) { - case "recaptcha": - options.add(Option.RECAPTCHA); case "captcha": options.add(Option.CAPTCHA); break; @@ -60,6 +58,6 @@ public class ProofRequiredException extends NonSuccessfulResponseCodeException { } public enum Option { - @Deprecated RECAPTCHA, CAPTCHA, PUSH_CHALLENGE + CAPTCHA, PUSH_CHALLENGE } }