Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-07-13 17:23:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Respect rate limit in send jobs.

Browse Source
This commit is contained in:
Cody Henthorne
2025-07-22 09:37:27 -04:00
committed by Michelle Tang
parent d1c02ac454
commit 635aa8791f
3 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/jobs/PushSendJob.java
+6
View File
@@ -75,6 +75,7 @@ import org.whispersystems.signalservice.api.messages.shared.SharedContact;
import org.whispersystems.signalservice.api.push.ServiceId.ACI;
import org.whispersystems.signalservice.api.push.exceptions.NonSuccessfulResponseCodeException;
import org.whispersystems.signalservice.api.push.exceptions.ProofRequiredException;
import org.whispersystems.signalservice.api.push.exceptions.RateLimitException;
import org.whispersystems.signalservice.api.push.exceptions.ServerRejectedException;
import org.whispersystems.signalservice.internal.push.BodyRange;
@@ -173,6 +174,11 @@ public abstract class PushSendJob extends SendJob {
if (backoff >= 0) {
return TimeUnit.SECONDS.toMillis(backoff);
}
} else if (exception instanceof RateLimitException) {
long backoff = ((RateLimitException) exception).getRetryAfterMilliseconds().orElse(-1L);
if (backoff >= 0) {
return backoff;
}
} else if (exception instanceof NonSuccessfulResponseCodeException) {
if (((NonSuccessfulResponseCodeException) exception).is5xx()) {
return BackoffUtil.exponentialBackoff(pastAttemptCount, RemoteConfig.getServerErrorMaxBackoff());
libsignal-service/src/main/java/org/whispersystems/signalservice/api/NetworkResultUtil.kt
+2 -2
View File
@@ -108,7 +108,7 @@ object NetworkResultUtil {
404 -> UnregisteredUserException(destination, result.exception)
409 -> MismatchedDevicesException(result.parseJsonBody())
410 -> StaleDevicesException(result.parseJsonBody())
413, 429 -> RateLimitException(result.code, "Rate Limited", Optional.ofNullable(result.header("retry-after")?.toLongOrNull()))
413, 429 -> RateLimitException(result.code, "Rate Limited", Optional.ofNullable(result.header("retry-after")?.toLongOrNull()?.seconds?.inWholeMilliseconds))
428 -> ProofRequiredException(result.parseJsonBody(), result.header("retry-after")?.toLongOrNull() ?: -1)
508 -> ServerRejectedException()
else -> result.exception
@@ -147,7 +147,7 @@ object NetworkResultUtil {
404 -> NotFoundException("At least one unregistered user is message send.")
409 -> GroupMismatchedDevicesException(result.parseJsonBody())
410 -> GroupStaleDevicesException(result.parseJsonBody())
413, 429 -> throw RateLimitException(result.code, "Rate Limited", Optional.ofNullable(result.header("retry-after")?.toLongOrNull()))
413, 429 -> throw RateLimitException(result.code, "Rate Limited", Optional.ofNullable(result.header("retry-after")?.toLongOrNull()?.seconds?.inWholeMilliseconds))
508 -> ServerRejectedException()
else -> result.exception
}
libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+6 -3
View File
@@ -1944,7 +1944,8 @@ public class SignalServiceMessageSender {
MismatchedDevicesException |
StaleDevicesException |
ProofRequiredException |
ServerRejectedException e) {
ServerRejectedException |
RateLimitException e) {
// Non-technical failures shouldn't be retried with socket
throw e;
} catch (WebSocketUnavailableException e) {
@@ -2166,7 +2167,8 @@ public class SignalServiceMessageSender {
throwable instanceof MismatchedDevicesException ||
throwable instanceof StaleDevicesException ||
throwable instanceof ProofRequiredException ||
throwable instanceof ServerRejectedException)
throwable instanceof ServerRejectedException ||
throwable instanceof RateLimitException)
{
// Non-technical failures shouldn't be retried with socket
return Single.error(throwable);
@@ -2456,7 +2458,8 @@ public class SignalServiceMessageSender {
NotFoundException |
GroupMismatchedDevicesException |
GroupStaleDevicesException |
ServerRejectedException e) {
ServerRejectedException |
RateLimitException e) {
// Non-technical failures shouldn't be retried with socket
throw e;
} catch (WebSocketUnavailableException e) {