Fixes FS#146: Remove Tor-Support

10 files changed, 11 insertions, 70 deletions

diff --git a/src/main/java/eu/siacs/conversations/Config.java b/src/main/java/eu/siacs/conversations/Config.java
index 0066074e..553abb9c 100644
--- a/src/main/java/eu/siacs/conversations/Config.java
+++ b/src/main/java/eu/siacs/conversations/Config.java
@@ -49,7 +49,6 @@ public final class Config {
 	public static final boolean DISALLOW_REGISTRATION_IN_UI = false; //hide the register checkbox
 
 	public static final boolean ALLOW_NON_TLS_CONNECTIONS = false; //very dangerous. you should have a good reason to set this to true
-	public static final boolean FORCE_ORBOT = false; // always use TOR
 	public static final boolean HIDE_MESSAGE_TEXT_IN_NOTIFICATION = false;
 	public static final boolean SHOW_CONNECTED_ACCOUNTS = false; //show number of connected accounts in foreground notification
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 1931988d..6791f417 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -255,10 +255,6 @@ public class Account extends AbstractEntity {
 		return this.hostname == null ? "" : this.hostname;
 	}
 
-	public boolean isOnion() {
-		return getServer().toString().toLowerCase().endsWith(".onion");
-	}
-
 	public void setPort(int port) {
 		this.port = port;
 	}
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");
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index e43ef062..b782b007 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -2402,10 +2402,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		return getPreferences().getBoolean("autojoin", true);
 	}
 
-	public boolean useTorToConnect() {
-		return Config.FORCE_ORBOT || getPreferences().getBoolean("use_tor", false);
-	}
-
 	public boolean showExtendedConnectionOptions() {
 		return getPreferences().getBoolean("show_connection_options", false);
 	}
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index 2b89ea05..44bf8140 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -528,9 +528,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			}
 		}
 		SharedPreferences preferences = getPreferences();
-		boolean useTor = Config.FORCE_ORBOT || preferences.getBoolean("use_tor", false);
-		this.mShowOptions = useTor || preferences.getBoolean("show_connection_options", false);
-		mHostname.setHint(useTor ? R.string.hostname_or_onion : R.string.hostname_example);
+		this.mShowOptions = preferences.getBoolean("show_connection_options", false);
 		this.mNamePort.setVisibility(mShowOptions ? View.VISIBLE : View.GONE);
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 014991ce..852699e6 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -62,14 +62,6 @@ public class SettingsActivity extends XmppActivity implements
 			}
 		}
 
-		if (Config.FORCE_ORBOT) {
-			PreferenceCategory connectionOptions = (PreferenceCategory) mSettingsFragment.findPreference("connection_options");
-			PreferenceScreen expert = (PreferenceScreen) mSettingsFragment.findPreference("expert");
-			if (connectionOptions != null) {
-				expert.removePreference(connectionOptions);
-			}
-		}
-
 		final Preference removeCertsPreference = mSettingsFragment.findPreference("remove_trusted_certificates");
 		removeCertsPreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
             @Override
@@ -175,8 +167,6 @@ public class SettingsActivity extends XmppActivity implements
 		} else if (name.equals("dont_trust_system_cas")) {
 			xmppConnectionService.updateMemorizingTrustmanager();
 			reconnectAccounts();
-		} else if (name.equals("use_tor")) {
-			reconnectAccounts();
 		} else if ("parse_emoticons".equals(name)) {
             EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS);
         }
diff --git a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java
index 768e9f17..04cfa2eb 100644
--- a/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java
+++ b/src/main/java/eu/siacs/conversations/utils/SocksSocketFactory.java
@@ -43,10 +43,6 @@ public class SocksSocketFactory {
 		return socket;
 	}
 
-	public static Socket createSocketOverTor(String destination, int port) throws IOException {
-		return createSocket(new InetSocketAddress(InetAddress.getLocalHost(), 9050), destination, port);
-	}
-
 	static class SocksConnectionException extends IOException {
 
 	}
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 2653e5f3..fa381668 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -245,19 +245,8 @@ public class XmppConnection implements Runnable {
 			tagReader = new XmlReader(wakeLock);
 			tagWriter = new TagWriter();
 			this.changeStatus(Account.State.CONNECTING);
-			final boolean useTor = mXmppConnectionService.useTorToConnect() || account.isOnion();
 			final boolean extended = mXmppConnectionService.showExtendedConnectionOptions();
-			if (useTor) {
-				String destination;
-				if (account.getHostname() == null || account.getHostname().isEmpty()) {
-					destination = account.getServer().toString();
-				} else {
-					destination = account.getHostname();
-				}
-				Log.d(Config.LOGTAG, account.getJid().toBareJid() + ": connect to " + destination + " via TOR");
-				socket = SocksSocketFactory.createSocketOverTor(destination, account.getPort());
-				startXmpp();
-			} else if (extended && account.getHostname() != null && !account.getHostname().isEmpty()) {
+            if (extended && account.getHostname() != null && !account.getHostname().isEmpty()) {
 				socket = new Socket();
 				try {
 					socket.connect(new InetSocketAddress(account.getHostname(), account.getPort()), Config.SOCKET_TIMEOUT * 1000);
@@ -332,8 +321,6 @@ public class XmppConnection implements Runnable {
 			this.changeStatus(Account.State.UNAUTHORIZED);
 		} catch (final UnknownHostException | ConnectException e) {
 			this.changeStatus(Account.State.SERVER_NOT_FOUND);
-		} catch (final SocksSocketFactory.SocksProxyNotFoundException e) {
-			this.changeStatus(Account.State.TOR_NOT_AVAILABLE);
 		} catch (final IOException | XmlPullParserException | NoSuchAlgorithmException e) {
 			Logging.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
 			this.changeStatus(Account.State.OFFLINE);
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
index 6400f123..76cd0c87 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java
@@ -59,14 +59,10 @@ public class JingleSocks5Transport extends JingleTransport {
 			@Override
 			public void run() {
 				try {
-					final boolean useTor = connection.getAccount().isOnion() || connection.getConnectionManager().getXmppConnectionService().useTorToConnect();
-					if (useTor) {
-						socket = SocksSocketFactory.createSocketOverTor(candidate.getHost(),candidate.getPort());
-					} else {
-						socket = new Socket();
-						SocketAddress address = new InetSocketAddress(candidate.getHost(),candidate.getPort());
-						socket.connect(address,Config.SOCKET_TIMEOUT * 1000);
-					}
+					socket = new Socket();
+					SocketAddress address = new InetSocketAddress(candidate.getHost(),candidate.getPort());
+					socket.connect(address,Config.SOCKET_TIMEOUT * 1000);
+
 					inputStream = socket.getInputStream();
 					outputStream = socket.getOutputStream();
 					SocksSocketFactory.createSocksConnection(socket,destination,0);