aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2015-11-30 15:43:54 +0100
committerDaniel Gultsch <daniel@gultsch.de>2015-12-01 12:00:50 +0100
commitb4a259837e56c81ce9e57fa6b37884b4a846713d (patch)
treea79b068dd3820dbc4e42f616477a9a5161516a41 /src/main/java
parent8ffcc11f278994b5bd2cebe2ee50b78a9d14a985 (diff)
always use http proxy for http requests. (socks is leaking dns)
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java6
1 files changed, 1 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 6435fd477..910c43f31 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java
@@ -95,10 +95,6 @@ public class HttpConnectionManager extends AbstractConnectionManager {
}
public Proxy getProxy() throws IOException {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
- return new Proxy(Proxy.Type.SOCKS, new InetSocketAddress(InetAddress.getLocalHost(), 9050));
- } else {
- return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(InetAddress.getLocalHost(), 8118));
- }
+ return new Proxy(Proxy.Type.HTTP, new InetSocketAddress(InetAddress.getLocalHost(), 8118));
}
}