commit ac6cdb70ba018e515de97c1a87ed9d3de84b1ad1 Author: Nathan Freitas <nathan@freitas.net> Date: Thu Aug 7 12:42:49 2014 -0400 enable app conflict checker for samsung users --- src/org/torproject/android/Orbot.java | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index f444921..678b98d 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -295,21 +295,25 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic private void appConflictChecker () { - boolean debug = TorServiceUtils.getSharedPrefs(getApplicationContext()).getBoolean("pref_enable_logging",false); + SharedPreferences sprefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); + + boolean showAppConflict = sprefs.getBoolean("pref_show_conflict",true); - if (debug) + String[] badApps = {"com.sec.msc.nts.android.proxy"}; + + for (String badApp : badApps) { - String[] badApps = {"com.sec.msc.nts.android.proxy"}; + if (appInstalledOrNot(badApp)) + { + if (showAppConflict) + showAlert(getString(R.string.app_conflict),getString(R.string.please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_) + badApp,true); - for (String badApp : badApps) - { - if (appInstalledOrNot(badApp)) - { - showAlert("App Conflict","Please disable this app in Android settings if you are having problems with Orbot: " + badApp,true); - break; - } - } + appendLogTextAndScroll(getString(R.string.please_disable_this_app_in_android_settings_apps_if_you_are_having_problems_with_orbot_) + badApp); + } } + + sprefs.edit().putBoolean("pref_show_conflict", false).commit(); + }