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

Fix skdm quarantine logic for transport failures.

Browse Source
This commit is contained in:
Cody Henthorne
2026-09-23 16:06:32 -04:00
committed by Michelle Tang
parent d6d4b2abcf
commit f627988255
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java
+5 -1
View File
@@ -2474,7 +2474,8 @@ public class SignalServiceMessageSender {
/**
* Converts common exceptions thrown during message sending to the appropriate {@link SendMessageResult}.
* <p>
* Exceptions that cannot be mapped will be rethrown as wrapped {@link IOException}s.
* Transport failures become {@link SendMessageResult#networkFailure} so that callers can keep the results of the
* recipients that did succeed. Exceptions that cannot be mapped will be rethrown as wrapped {@link IOException}s.
*/
public static @Nonnull SendMessageResult mapSendErrorToSendResult(@Nonnull Throwable t, long timestamp, @Nonnull SignalServiceAddress recipient) throws IOException {
if (t instanceof UntrustedIdentityException) {
@@ -2498,6 +2499,9 @@ public class SignalServiceMessageSender {
} else if (t instanceof InvalidPreKeyException) {
Log.w(TAG, "[" + timestamp + "] Hit invalid prekey: " + recipient.getIdentifier(), t);
return SendMessageResult.invalidPreKeyFailure(recipient);
} else if (t instanceof IOException && !(t instanceof NonSuccessfulResponseCodeException)) {
Log.w(TAG, "[" + timestamp + "] Hit transport failure: " + recipient.getIdentifier(), t);
return SendMessageResult.networkFailure(recipient);
} else {
Log.w(TAG, "[" + timestamp + "] Hit unknown exception: " + recipient.getIdentifier(), t);
throw new IOException(t);