[tor-commits] [orbot/master] Start the meek transport for custom meek bridges

[n8fr8 at torproject.org]

commit 5adcbecf4cc60afc94accce92e8e1d96028fbafc
Author: srvetus <srvetus at tuta.io>
Date:   Sun Mar 20 03:45:11 2016 +0000

    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 24a90db..eb538c0 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)