From 14215c38e156d8599bf26c69f99987c572269fbe Mon Sep 17 00:00:00 2001 From: Benedikt Constantin Radtke Date: Thu, 11 May 2017 12:27:27 +0200 Subject: [PATCH] fix unnecessary threadpool-creation New OkHttpClients came with their own thread and connection pools. With newBuilder() we can create a new client with an already existing pool. Fixes https://github.com/WhisperSystems/Signal-Android/issues/6283 --- .../signalservice/internal/push/PushServiceSocket.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/java/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java index 400460cdee..26986f0aa0 100644 --- a/java/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java +++ b/java/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java @@ -77,6 +77,7 @@ public class PushServiceSocket { private static final String TAG = PushServiceSocket.class.getSimpleName(); + private static final OkHttpClient CLIENT = new OkHttpClient(); private static final String CREATE_ACCOUNT_SMS_PATH = "/v1/accounts/sms/code/%s"; private static final String CREATE_ACCOUNT_VOICE_PATH = "/v1/accounts/voice/code/%s"; @@ -612,7 +613,7 @@ private Response getConnection(String urlFragment, String method, String body) SSLContext context = SSLContext.getInstance("TLS"); context.init(null, trustManagers, null); - OkHttpClient.Builder okHttpClientBuilder = new OkHttpClient.Builder() + OkHttpClient.Builder okHttpClientBuilder = CLIENT.newBuilder() .sslSocketFactory(context.getSocketFactory(), (X509TrustManager)trustManagers[0]) .connectTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS) .readTimeout(soTimeoutMillis, TimeUnit.MILLISECONDS);