commit 313c92f863154b38cb3d37ff150eabbe0f7554f3 Author: Nathan Freitas <nathan@freitas.net> Date: Sat Sep 6 01:02:38 2014 -0400 add warning about restarting Orbot after settings changes --- res/values/strings.xml | 3 +++ src/org/torproject/android/Orbot.java | 10 ++++++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 8e1df63..e5819c0 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -293,5 +293,8 @@ <string name="pref_transproxy_flush_title">Transproxy FORCE REMOVE</string> <string name="pref_transproxy_flush_summary">Tap here to flush all transproxy network rules NOW</string> + <string name="transparent_proxy_rules_flushed_">Transparent proxy rules flushed!</string> + <string name="you_do_not_have_root_access_enabled">You do not have ROOT access enabled</string> + <string name="you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_">You may need to stop and start Orbot for settings change to be enabled.</string> </resources> diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index c448ed9..d5cd9da 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -790,6 +790,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic protected void onActivityResult(int request, int response, Intent data) { super.onActivityResult(request, response, data); + if (request == 1 && response == RESULT_OK) { if (data != null && data.getBooleanExtra("transproxywipe", false)) @@ -801,19 +802,24 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic if (result) { - Toast.makeText(this, "Transparent proxy rules flushed!", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.transparent_proxy_rules_flushed_, Toast.LENGTH_SHORT).show(); } else { - Toast.makeText(this, "You do not have ROOT access enabled", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, R.string.you_do_not_have_root_access_enabled, Toast.LENGTH_SHORT).show(); } } catch (RemoteException e) { e.printStackTrace(); } } + else + { + Toast.makeText(this, R.string.you_may_need_to_stop_and_start_orbot_for_settings_change_to_be_enabled_, Toast.LENGTH_SHORT).show(); + + } } }