From 5adcbecf4cc60afc94accce92e8e1d96028fbafc Mon Sep 17 00:00:00 2001 From: srvetus Date: Sun, 20 Mar 2016 03:45:11 +0000 Subject: [PATCH 1/2] Start the meek transport for custom meek bridges --- src/org/torproject/android/service/TorService.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 24a90db9..eb538c05 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -23,7 +23,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.net.VpnService; +import android.net.VpnService;me import android.os.Build; import android.os.IBinder; import android.os.RemoteException; @@ -1920,7 +1920,7 @@ public class TorService extends VpnService implements TorServiceConstants, Orbot { //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) { @@ -1929,6 +1929,12 @@ public class TorService extends VpnService implements TorServiceConstants, Orbot 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"); for (String bridgeConfigLine : bridgeListLines) From 21c5bcc7e71fe95b2386e1d89b4907e9b0ed9775 Mon Sep 17 00:00:00 2001 From: srvetus Date: Sun, 20 Mar 2016 03:47:50 +0000 Subject: [PATCH 2/2] Remove typo --- src/org/torproject/android/service/TorService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index eb538c05..b90442ba 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -23,7 +23,7 @@ import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.net.ConnectivityManager; import android.net.NetworkInfo; -import android.net.VpnService;me +import android.net.VpnService; import android.os.Build; import android.os.IBinder; import android.os.RemoteException;