mirror/monocles_chat_clean
1
0
Fork 1
Code Activity

disable read timeout for HTTP Upload

Browse source 
fixes #4057

(cherry picked from commit 2760f07307caa6f7bad8bbdf825abbd0056334d7)
This commit is contained in:
Daniel Gultsch 2021-04-18 15:46:37 +02:00 • committed by Christian Schneppe
parent 744b7370c1
commit 0eefdc7b54
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
View file

@ -41,6 +41,8 @@ public class HttpConnectionManager extends AbstractConnectionManager {
public static final Executor FileTransferExecutor = Executors.newFixedThreadPool(4);
private static final OkHttpClient OK_HTTP_CLIENT = new OkHttpClient();
public HttpConnectionManager(XmppConnectionService service) {
super(service);
}
@ -50,8 +52,8 @@ public class HttpConnectionManager extends AbstractConnectionManager {
try {
localhost = InetAddress.getByAddress(new byte[]{127, 0, 0, 1});
} catch (final UnknownHostException e) {
throw new IllegalStateException(e);
}
throw new IllegalStateException(e);
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(localhost, 9050));
} else {
@ -104,12 +106,15 @@ public class HttpConnectionManager extends AbstractConnectionManager {
}
OkHttpClient buildHttpClient(final HttpUrl url, final Account account, boolean interactive) {
return buildHttpClient(url, account, 30, interactive);
}
OkHttpClient buildHttpClient(final HttpUrl url, final Account account, int readTimeout, boolean interactive) {
final String slotHostname = url.host();
final boolean onionSlot = slotHostname.endsWith(".onion");
final OkHttpClient.Builder builder = new OkHttpClient.Builder();
//builder.addInterceptor(new HttpLoggingInterceptor().setLevel(HttpLoggingInterceptor.Level.HEADERS));
final OkHttpClient.Builder builder = OK_HTTP_CLIENT.newBuilder();
builder.writeTimeout(30, TimeUnit.SECONDS);
builder.readTimeout(30, TimeUnit.SECONDS);
builder.readTimeout(readTimeout, TimeUnit.SECONDS);
setupTrustManager(builder, interactive);
if (mXmppConnectionService.useTorToConnect() || account.isOnion() || onionSlot) {
builder.proxy(HttpConnectionManager.getProxy()).build();
@ -139,7 +144,7 @@ public class HttpConnectionManager extends AbstractConnectionManager {
}
public static InputStream open(final HttpUrl httpUrl, final boolean tor) throws IOException {
final OkHttpClient.Builder builder = new OkHttpClient.Builder();
final OkHttpClient.Builder builder = OK_HTTP_CLIENT.newBuilder();
if (tor) {
builder.proxy(HttpConnectionManager.getProxy()).build();
}

1
src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
View file

@ -164,6 +164,7 @@ public class HttpUploadConnection implements Transferable, AbstractConnectionMan
final OkHttpClient client = mHttpConnectionManager.buildHttpClient(
slot.put,
message.getConversation().getAccount(),
0,
true
);
final RequestBody requestBody = AbstractConnectionManager.requestBody(file, this);