Remove Option.RECAPTCHA from ProofRequiredException.

This commit is contained in:
Chris Eager
2024-06-25 11:16:09 -05:00
committed by Cody Henthorne
parent 58d769b21f
commit 02629020df
2 changed files with 3 additions and 10 deletions
@@ -602,13 +602,8 @@ public abstract class PushSendJob extends SendJob {
SignalDatabase.messages().markAsRateLimited(messageId);
}
final Optional<ProofRequiredException.Option> 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) {
@@ -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
}
}