Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-27 04:04:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Disable okhttp automatic retries for CDSI.

Browse Source
This commit is contained in:
Greyson Parrelli
2022-10-07 16:06:27 -04:00
parent 4b10ec8f02
commit a9f654a520
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libsignal/service/src/main/java/org/whispersystems/signalservice/api/services/CdsiSocket.java
View File

@@ -64,6 +64,7 @@ final class CdsiSocket {
OkHttpClient.Builder builder = new OkHttpClient.Builder()
.sslSocketFactory(new Tls12SocketFactory(socketFactory.first()), socketFactory.second())
.connectionSpecs(Util.immutableList(ConnectionSpec.RESTRICTED_TLS))
.retryOnConnectionFailure(false)
.readTimeout(30, TimeUnit.SECONDS)
.connectTimeout(30, TimeUnit.SECONDS);
@@ -92,7 +93,7 @@ final class CdsiSocket {
WebSocket webSocket = okhttp.newWebSocket(request, new WebSocketListener() {
@Override
public void onOpen(WebSocket webSocket, Response response) {
Log.d(TAG, "onOpen");
Log.d(TAG, "[onOpen]");
stage.set(Stage.WAITING_FOR_CONNECTION);
}
@@ -163,6 +164,7 @@ final class CdsiSocket {
@Override
public void onClosing(WebSocket webSocket, int code, String reason) {
Log.i(TAG, "[onClosing] code: " + code + ", reason: " + reason);
if (code == 1000) {
emitter.onComplete();
stage.set(Stage.CLOSED);
@@ -176,6 +178,7 @@ final class CdsiSocket {
@Override
public void onFailure(WebSocket webSocket, Throwable t, Response response) {
Log.w(TAG, "[onFailure] response? " + (response != null), t);
emitter.tryOnError(t);
stage.set(Stage.FAILED);
webSocket.close(1000, "OK");