Ticket #18585: orbot-meek.patch

File orbot-meek.patch, 2.8 KB (added by cypherpunks, 3 years ago)

orbot-meek-bridge.patch

  • src/org/torproject/android/service/TorService.java

    From 5adcbecf4cc60afc94accce92e8e1d96028fbafc Mon Sep 17 00:00:00 2001
    From: srvetus <srvetus@tuta.io>
    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 24a90db..eb538c0 100644
    a b  
    2323import android.content.SharedPreferences.Editor;
    2424import android.net.ConnectivityManager;
    2525import android.net.NetworkInfo;
    26 import android.net.VpnService;
     26import android.net.VpnService;me
    2727import android.os.Build;
    2828import android.os.IBinder;
    2929import android.os.RemoteException;
    else if (proxyPass != null) 
    19201920            {
    19211921
    19221922               //check if any PT bridges are needed
    1923                boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit")||bridgeList.contains("meek");
     1923               boolean obfsBridges = bridgeList.contains("obfs3")||bridgeList.contains("obfs4")||bridgeList.contains("scramblesuit");
    19241924
    19251925               if (obfsBridges)
    19261926               {
    else if (proxyPass != null) 
    19291929                   extraLines.append("ClientTransportPlugin scramblesuit exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n');
    19301930               }
    19311931
     1932               boolean meekBridges = bridgeList.contains("meek");
     1933               if (meekBridges)
     1934               {
     1935                   extraLines.append("ClientTransportPlugin meek_lite exec " + OrbotApp.fileObfsclient.getCanonicalPath()).append('\n');
     1936               }
     1937
    19321938               String[] bridgeListLines = bridgeList.split("\\r?\\n");
    19331939
    19341940               for (String bridgeConfigLine : bridgeListLines)
  • src/org/torproject/android/service/TorService.java

    From 21c5bcc7e71fe95b2386e1d89b4907e9b0ed9775 Mon Sep 17 00:00:00 2001
    From: srvetus <srvetus@tuta.io>
    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 eb538c0..b90442b 100644
    a b  
    2323import android.content.SharedPreferences.Editor;
    2424import android.net.ConnectivityManager;
    2525import android.net.NetworkInfo;
    26 import android.net.VpnService;me
     26import android.net.VpnService;
    2727import android.os.Build;
    2828import android.os.IBinder;
    2929import android.os.RemoteException;