commit b941a1c7d5588db7efd9fab672ec518a69f76f84 Author: Nathan Freitas nathan@freitas.net Date: Mon Apr 13 08:36:01 2015 -0400

show warning about bridge limits on Intel x86/ATOM devices --- res/values/strings.xml | 2 ++ src/org/torproject/android/OrbotMainActivity.java | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml index 0318cac..64ab5fc 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -339,4 +339,6 @@ <string name="install_orweb">Install Orweb</string>

<string name="standard_browser">Standard Browser</string> + + <string name="note_only_standard_tor_bridges_work_on_intel_x86_atom_devices">NOTE: Only standard Tor bridges work on Intel X86/ATOM devices</string> </resources> diff --git a/src/org/torproject/android/OrbotMainActivity.java b/src/org/torproject/android/OrbotMainActivity.java index 2ed81da..26750ea 100644 --- a/src/org/torproject/android/OrbotMainActivity.java +++ b/src/org/torproject/android/OrbotMainActivity.java @@ -293,6 +293,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon } else { + Toast.makeText(OrbotMainActivity.this, R.string.note_only_standard_tor_bridges_work_on_intel_x86_atom_devices, Toast.LENGTH_LONG).show(); showGetBridgePrompt(""); //if other chip ar, only stock bridges are supported } } @@ -945,9 +946,7 @@ public class OrbotMainActivity extends Activity implements OrbotConstants, OnLon { @Override public void onClick(DialogInterface dialog, int which) { - - //mBtnBridges.setChecked(false); - + //do nothing } }) .setNeutralButton(R.string.get_bridges_email, new Dialog.OnClickListener ()