Fixes FS#146: Remove Tor-Support

2 files changed, 5 insertions, 22 deletions

diff --git a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
index 00416c94..1470d250 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java
@@ -44,13 +44,11 @@ public class HttpDownloadConnection implements Transferable {
 	private int mStatus = Transferable.STATUS_UNKNOWN;
 	private boolean acceptedAutomatically = false;
 	private int mProgress = 0;
-    private boolean mUseTor = false;
     private boolean canceled = false;
 
 	public HttpDownloadConnection(HttpConnectionManager manager) {
 		this.mHttpConnectionManager = manager;
 		this.mXmppConnectionService = manager.getXmppConnectionService();
-        this.mUseTor = mXmppConnectionService.useTorToConnect();
 	}
 
 	@Override
@@ -200,12 +198,7 @@ public class HttpDownloadConnection implements Transferable {
             try {
                 Logging.d(Config.LOGTAG, "retrieve file size. interactive:" + String.valueOf(interactive));
                 changeStatus(STATUS_CHECKING);
-                HttpURLConnection connection;
-                if (mUseTor) {
-                    connection = (HttpURLConnection) mUrl.openConnection(mHttpConnectionManager.getProxy());
-                } else {
-                    connection = (HttpURLConnection) mUrl.openConnection();
-                }
+                HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
                 connection.setRequestMethod("HEAD");
                 Logging.d(Config.LOGTAG, "url: "+connection.getURL().toString());
                 Logging.d(Config.LOGTAG, "connection: "+connection.toString());
@@ -260,12 +253,7 @@ public class HttpDownloadConnection implements Transferable {
             PowerManager.WakeLock wakeLock = mHttpConnectionManager.createWakeLock("http_download_"+message.getUuid());
             try {
                 wakeLock.acquire();
-                HttpURLConnection connection;
-                if (mUseTor) {
-                    connection = (HttpURLConnection) mUrl.openConnection(mHttpConnectionManager.getProxy());
-                } else {
-                    connection = (HttpURLConnection) mUrl.openConnection();
-                }
+                HttpURLConnection connection = (HttpURLConnection) mUrl.openConnection();
                 if (connection instanceof HttpsURLConnection) {
                     mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, interactive);
                 }
diff --git a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
index b16d9f79..4842a218 100644
--- a/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
+++ b/src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java
@@ -49,7 +49,6 @@ public class HttpUploadConnection implements Transferable {
 	private String mime;
 	private URL mGetUrl;
 	private URL mPutUrl;
-	private boolean mUseTor = false;
 
 	private byte[] key = null;
 
@@ -60,7 +59,6 @@ public class HttpUploadConnection implements Transferable {
 	public HttpUploadConnection(HttpConnectionManager httpConnectionManager) {
 		this.mHttpConnectionManager = httpConnectionManager;
 		this.mXmppConnectionService = httpConnectionManager.getXmppConnectionService();
-		this.mUseTor = mXmppConnectionService.useTorToConnect();
 	}
 
 	@Override
@@ -163,12 +161,9 @@ public class HttpUploadConnection implements Transferable {
 			try {
 				wakeLock.acquire();
 				Logging.d(Config.LOGTAG, "uploading to " + mPutUrl.toString());
-				if (mUseTor) {
-					connection = (HttpURLConnection) mPutUrl.openConnection(mHttpConnectionManager.getProxy());
-				} else {
-					connection = (HttpURLConnection) mPutUrl.openConnection();
-				}
-				if (connection instanceof HttpsURLConnection) {
+				connection = (HttpURLConnection) mPutUrl.openConnection();
+
+                if (connection instanceof HttpsURLConnection) {
 					mHttpConnectionManager.setupTrustManager((HttpsURLConnection) connection, true);
 				}
 				connection.setRequestMethod("PUT");