dan
/
tor-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

enable app conflict checker for samsung users

This commit is contained in:
Nathan Freitas 2014-08-07 12:42:49 -04:00
parent 1801ec179f
commit ac6cdb70ba
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/org/torproject/android/Orbot.java
View File

@ -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)
{
if (appInstalledOrNot(badApp))
{
showAlert("App Conflict","Please disable this app in Android settings if you are having problems with Orbot: " + badApp,true);
break;
}
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);
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();
}