diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-11-30 15:43:54 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-11-30 15:43:54 +0100 |
| commit | c02af991aeed04f6a19b98dade4666cbed49d9a3 (patch) | |
| tree | dcbdd8683605e329d6acebb1c05f7c88e31a1d2c | |
| parent | e13707a11158d7ff99cd86477e53307fd621fe37 (diff) | |
always use http proxy for http requests. (socks is leaking dns)
| -rw-r--r-- | src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java | 6 |
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 6435fd47..910c43f3 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)); } } |