dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Start the meek transport for custom meek bridges

This commit is contained in:
srvetus 2016-03-20 03:45:11 +00:00
parent 6452075d46
commit 5adcbecf4c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/org/torproject/android/service/TorService.java
View File

@ -23,7 +23,7 @@ import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.Editor;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.NetworkInfo; import android.net.NetworkInfo;
import android.net.VpnService; import android.net.VpnService;me
import android.os.Build; import android.os.Build;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
@ -1920,7 +1920,7 @@ public class TorService extends VpnService implements TorServiceConstants, Orbot
{ {
//check if any PT bridges are needed //check if any PT bridges are needed
boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit")||bridgeList.contains("meek"); boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit");
if (obfsBridges) if (obfsBridges)
{ {
@ -1929,6 +1929,12 @@ public class TorService extends VpnService implements TorServiceConstants, Orbot
extraLines.append("ClientTransportPlugin scramblesuit exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n'); extraLines.append("ClientTransportPlugin scramblesuit exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n');
} }
boolean meekBridges = bridgeList.contains("meek");
if (meekBridges)
{
extraLines.append("ClientTransportPlugin meek_lite exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n');
}
String[] bridgeListLines = bridgeList.split("\\r?\\n"); String[] bridgeListLines = bridgeList.split("\\r?\\n");
for (String bridgeConfigLine : bridgeListLines) for (String bridgeConfigLine : bridgeListLines)