From 17aa2aee39e3db392734c29c438da7773960086e Mon Sep 17 00:00:00 2001 From: Stephen Paul Weber Date: Wed, 1 Mar 2023 11:00:29 -0500 Subject: [PATCH] Allow getting a set-up client from anywhere --- .../http/HttpConnectionManager.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java index 27f5c3fc7bdcbb8f78aa00c5b964c0a3efee4ae6..3a4a7f64af109accfb8371bdd0caa8152ce1f42f 100644 --- a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java +++ b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java @@ -156,16 +156,22 @@ public class HttpConnectionManager extends AbstractConnectionManager { } } + public static OkHttpClient.Builder newBuilder(final boolean tor) { + final OkHttpClient.Builder builder = OK_HTTP_CLIENT.newBuilder(); + builder.writeTimeout(30, TimeUnit.SECONDS); + builder.readTimeout(30, TimeUnit.SECONDS); + if (tor) { + builder.proxy(HttpConnectionManager.getProxy()).build(); + } + return builder; + } + public static InputStream open(final String url, final boolean tor) throws IOException { return open(HttpUrl.get(url), tor); } public static InputStream open(final HttpUrl httpUrl, final boolean tor) throws IOException { - final OkHttpClient.Builder builder = OK_HTTP_CLIENT.newBuilder(); - if (tor) { - builder.proxy(HttpConnectionManager.getProxy()).build(); - } - final OkHttpClient client = builder.build(); + final OkHttpClient client = newBuilder(tor).build(); final Request request = new Request.Builder().get().url(httpUrl).build(); final ResponseBody body = client.newCall(request).execute().body(); if (body == null) {