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

only show app warning if debug is on

This commit is contained in:
Nathan Freitas 2014-04-17 13:39:40 -04:00
parent 78e7af4372
commit edd3195ec8
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ import android.content.ServiceConnection;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.Editor;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.content.res.Configuration; import android.content.res.Configuration;
@ -282,16 +283,20 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
private void appConflictChecker () private void appConflictChecker ()
{ {
boolean debug = mPrefs.getBoolean("pref_enable_logging",false);
String[] badApps = {"com.sec.msc.nts.android.proxy"}; if (debug)
for (String badApp : badApps)
{ {
if (appInstalledOrNot(badApp)) String[] badApps = {"com.sec.msc.nts.android.proxy"};
{
showAlert(getString(R.string.title_error),"Please uninstall or disable this app if you are having problems with Orbot: " + badApp,true); for (String badApp : badApps)
break; {
} if (appInstalledOrNot(badApp))
{
showAlert("App Conflict","Please disable this app in Android settings if you are having problems with Orbot: " + badApp,true);
break;
}
}
} }
} }
@ -714,7 +719,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
boolean app_installed = false; boolean app_installed = false;
try try
{ {
pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES); PackageInfo pi = pm.getPackageInfo(uri, PackageManager.GET_ACTIVITIES);
app_installed = true; app_installed = true;
} }
catch (PackageManager.NameNotFoundException e) catch (PackageManager.NameNotFoundException e)