Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '228-jsocks' into 'master'

Browse Source 
Replaced broken jsocks jar. #228

Fixes #228 and may also fix #217. @str4d and @grote, please test and confirm.

See merge request !72
This commit is contained in:
Torsten Grote
2016-01-21 13:49:37 +00:00
parent aacd347376 3b510e768a
commit d33dbca25a
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}
}