empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Update Option.RECAPTCHA to Option.CAPTCHA

Browse source
This commit is contained in:
Chris Eager 2024-03-14 09:52:26 -05:00 • committed by Cody Henthorne
parent 8f884fdd5c
commit 0c6761fcfd
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
View file

@ -594,8 +594,13 @@ public abstract class PushSendJob extends SendJob {
SignalDatabase.messages().markAsRateLimited(messageId);
}
if (proofRequired.getOptions().contains(ProofRequiredException.Option.RECAPTCHA)) {
Log.i(TAG, "[Proof Required] ReCAPTCHA required.");
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.");
SignalStore.rateLimit().markNeedsRecaptcha(proofRequired.getToken());
if (recipient != null) {

4
libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/exceptions/ProofRequiredException.java
View file

@ -44,6 +44,8 @@ public class ProofRequiredException extends NonSuccessfulResponseCodeException {
switch (raw) {
case "recaptcha":
options.add(Option.RECAPTCHA);
case "captcha":
options.add(Option.CAPTCHA);
break;
case "pushChallenge":
options.add(Option.PUSH_CHALLENGE);
@ -58,6 +60,6 @@ public class ProofRequiredException extends NonSuccessfulResponseCodeException {
}
public enum Option {
RECAPTCHA, PUSH_CHALLENGE
@Deprecated RECAPTCHA, CAPTCHA, PUSH_CHALLENGE
}
}

2
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SubmitRecaptchaChallengePayload.java
View file

@ -16,7 +16,7 @@ class SubmitRecaptchaChallengePayload {
public SubmitRecaptchaChallengePayload() {}
public SubmitRecaptchaChallengePayload(String challenge, String recaptchaToken) {
this.type = "recaptcha";
this.type = "captcha";
this.token = challenge;
this.captcha = recaptchaToken;
}