commit d8648a5864d6d1421875dc7a6787fe5fea9eaf9f
Author: Nathan Freitas <[email protected]>
Date: Fri Oct 21 14:41:06 2016 -0400
remove meek-google as an option
---
app/src/main/java/org/torproject/android/OrbotMainActivity.java | 6 +-----
orbotservice/src/main/res/values/arrays.xml | 1 -
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 5e57c2c..556179a 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -934,11 +934,7 @@ public class OrbotMainActivity extends AppCompatActivity
enableBridges(true);
break;
- case 5: //google
- Prefs.setBridgesList("0");
- enableBridges(true);
- break;
- case 6:
+ case 5:
showGetBridgePrompt("obfs4");
break;
diff --git a/orbotservice/src/main/res/values/arrays.xml
b/orbotservice/src/main/res/values/arrays.xml
index 30d20c1..7defef0 100644
--- a/orbotservice/src/main/res/values/arrays.xml
+++ b/orbotservice/src/main/res/values/arrays.xml
@@ -8,7 +8,6 @@
<item>ScrambleSuit</item>
<item>Tunnel through Azure</item>
<item>Tunnel through Amazon</item>
- <item>Tunnel through Google</item>
<item>Get New Bridges</item>
<item></item>
</string-array>
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
