Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-07-08 06:54:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error handling resiliance.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-05-04 13:37:25 -04:00
parent e2d4ca9a4c
commit 0542262c49
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/org/thoughtcrime/securesms/jobs/SendRetryReceiptJob.java
+2 -1
View File
@@ -19,6 +19,7 @@ import org.thoughtcrime.securesms.recipients.RecipientId;
import org.thoughtcrime.securesms.recipients.RecipientUtil;
import org.whispersystems.signalservice.api.push.SignalServiceAddress;
import org.whispersystems.signalservice.api.push.exceptions.PushNetworkException;
import org.whispersystems.signalservice.api.push.exceptions.RateLimitException;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
@@ -97,7 +98,7 @@ public final class SendRetryReceiptJob extends BaseJob {
@Override
protected boolean onShouldRetry(@NonNull Exception e) {
return e instanceof PushNetworkException;
return e instanceof PushNetworkException || e instanceof RateLimitException;
}
@Override
app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt
+1 -1
View File
@@ -341,7 +341,7 @@ object MessageDecryptor {
if (contentHint == ContentHint.IMPLICIT) {
Log.w(TAG, "${logPrefix(envelope, senderServiceId)} The content hint is $contentHint, so no error message is needed.", true)
Result.Ignore(envelope, serverDeliveredTimestamp, followUpOperations)
return Result.Ignore(envelope, serverDeliveredTimestamp, followUpOperations)
} else {
Log.w(TAG, "${logPrefix(envelope, senderServiceId)} The content hint is $contentHint, so we need to insert an error right away.", true)
return Result.DecryptionError(envelope, serverDeliveredTimestamp, protocolException.toErrorMetadata(), followUpOperations.toUnmodifiableList())