Replaced broken jsocks jar. #228

briar-android/build.gradle

@@ -15,7 +15,6 @@ dependencies {
     compile "com.android.support:preference-v14:23.1.1"
     compile "com.android.support:design:23.1.1"
     compile "org.roboguice:roboguice:2.0"
-    compile "org.connectbot.jsocks:jsocks:1.0.0"
     compile "info.guardianproject.panic:panic:0.5"
     compile "info.guardianproject.trustedintents:trustedintents:0.2"
 }
@@ -30,7 +29,6 @@ dependencyVerification {
             'com.android.support:support-annotations:f347a35b9748a4103b39a6714a77e2100f488d623fd6268e259c177b200e9d82',
             'com.android.support:recyclerview-v7:7606373da0931a1e62588335465a0e390cd676c98117edab29220317495faefd',
             'org.roboguice:roboguice:c5302f2648170ee6015a0d18fe0fcc87e09e415a34aeae3566e8d1a9dbb53f28',
-            'org.connectbot.jsocks:jsocks:4ae46cd23dfd2496e90a9cde5cd32884ec8b3871a8815dbf425dca224cbc2589',
             'info.guardianproject.panic:panic:a7ed9439826db2e9901649892cf9afbe76f00991b768d8f4c26332d7c9406cb2',
             'info.guardianproject.trustedintents:trustedintents:6221456d8821a8d974c2acf86306900237cf6afaaa94a4c9c44e161350f80f3e',
     ]

briar-android/src/org/briarproject/plugins/tor/TorPlugin.java

@@ -10,6 +10,8 @@ import android.os.FileObserver;
 
 import net.freehaven.tor.control.EventHandler;
 import net.freehaven.tor.control.TorControlConnection;
+import net.sourceforge.jsocks.socks.Socks5Proxy;
+import net.sourceforge.jsocks.socks.SocksSocket;
 
 import org.briarproject.api.Settings;
 import org.briarproject.api.TransportId;
@@ -23,7 +25,6 @@ import org.briarproject.api.plugins.duplex.DuplexPlugin;
 import org.briarproject.api.plugins.duplex.DuplexPluginCallback;
 import org.briarproject.api.plugins.duplex.DuplexTransportConnection;
 import org.briarproject.api.system.LocationUtils;
-import org.briarproject.api.settings.SettingsManager;
 import org.briarproject.util.StringUtils;
 
 import java.io.EOFException;
@@ -47,9 +48,6 @@ import java.util.logging.Logger;
 import java.util.regex.Pattern;
 import java.util.zip.ZipInputStream;
 
-import net.sourceforge.jsocks.Socks5Proxy;
-import net.sourceforge.jsocks.SocksSocket;
-
 import static android.content.Context.CONNECTIVITY_SERVICE;
 import static android.content.Context.MODE_PRIVATE;
 import static android.net.ConnectivityManager.CONNECTIVITY_ACTION;
@@ -538,7 +536,8 @@ class TorPlugin implements DuplexPlugin, EventHandler,
 			if (LOG.isLoggable(INFO)) LOG.info("Connected to " + onion);
 			return new TorTransportConnection(this, s);
 		} catch (IOException e) {
-			if (LOG.isLoggable(INFO)) LOG.info("Could not connect to " + onion);
+			if (LOG.isLoggable(INFO))
+				LOG.info("Could not connect to " + onion + ": " + e);
 			return null;
 		}
 	}