From b4a259837e56c81ce9e57fa6b37884b4a846713d Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 30 Nov 2015 15:43:54 +0100
Subject: [PATCH] always use http proxy for http requests. (socks is leaking
 dns)

---
 .../eu/siacs/conversations/http/HttpConnectionManager.java  | 6 +-----
 1 file changed, 1 insertion(+), 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));
 	}
 }