commit b98a0ff160d55d5f218031aa501d109d238b188c Author: n8fr8 nathan@freitas.net Date: Mon Oct 16 23:48:45 2017 -0400
simplify bridge selection screen --- app/src/main/java/org/torproject/android/OrbotMainActivity.java | 7 +------ app/src/main/res/values-es/arrays.xml | 3 +-- app/src/main/res/values/arrays.xml | 7 +++---- 3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index afeab503..354b4a05 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -1040,12 +1040,7 @@ public class OrbotMainActivity extends AppCompatActivity enableBridges(true);
break; - case 1: //azure - Prefs.setBridgesList("meek"); - enableBridges(true); - - break; - case 2: //amazon + case 2: //amazon & azure Prefs.setBridgesList("meek"); enableBridges(true); diff --git a/app/src/main/res/values-es/arrays.xml b/app/src/main/res/values-es/arrays.xml index f521c318..feb0062d 100644 --- a/app/src/main/res/values-es/arrays.xml +++ b/app/src/main/res/values-es/arrays.xml @@ -4,8 +4,7 @@
<string-array name="bridge_options"> <item>Obfs4 (Preferido)</item> - <item>Túnel a través de Azure</item> - <item>Túnel a través de Amazon</item> + <item>Túnel a través de Azure y Amazon</item> <item>Obtener nuevos puentes</item> <item></item> </string-array> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index d0f22015..9e7a6196 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -3,10 +3,9 @@ <resources>
<string-array name="bridge_options"> - <item>Obfs4 (Best)</item> - <item>Tunnel through Azure</item> - <item>Tunnel through Amazon</item> - <item>Get New Bridges</item> + <item>Default Bridges (Obfs4)</item> + <item>Cloud Tunneling (Meek)</item> + <item>Get New Bridges...</item> <item></item> </string-array> <string-array name="array_hs_types">