diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-11-30 15:43:54 +0100 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2015-12-04 20:04:30 +0100 |
| commit | 608c4ef248087f8856b1975a227072300375f8ef (patch) | |
| tree | f1fcc6f01a899d7772a7e6f7606d8936de5e4f5f /src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java | |
| parent | 075cdd38c3a8d6d4018833927948065ab2fcdb24 (diff) | |
always use http proxy for http requests. (socks is leaking dns)
Diffstat (limited to '')
| -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 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)); } } |