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

Handle web socket closed unexpectedly errors more gracefully.

Browse source
This commit is contained in:
Cody Henthorne 2024-12-03 11:16:51 -05:00 • committed by Greyson Parrelli
parent 49e57a3c66
commit e6c5080a07
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/ApplicationContext.java
View file

@ -362,6 +362,8 @@ public class ApplicationContext extends Application implements AppForegroundObse
return;
}
Log.e(TAG, "RxJava error handler invoked", e);
Thread.UncaughtExceptionHandler uncaughtExceptionHandler = Thread.currentThread().getUncaughtExceptionHandler();
if (uncaughtExceptionHandler == null) {
uncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();

3
libsignal-service/src/main/java/org/whispersystems/signalservice/internal/websocket/OkHttpWebSocketConnection.java
View file

@ -16,6 +16,7 @@ import org.whispersystems.signalservice.internal.util.BlacklistingTrustManager;
import org.whispersystems.signalservice.internal.util.Util;
import java.io.IOException;
import java.net.SocketException;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
@ -353,7 +354,7 @@ public class OkHttpWebSocketConnection extends WebSocketListener implements WebS
while (iterator.hasNext()) {
Map.Entry<Long, OutgoingRequest> entry = iterator.next();
entry.getValue().onError(new IOException("Closed unexpectedly"));
entry.getValue().onError(new SocketException("Closed unexpectedly"));
iterator.remove();
}