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

check for evil samsung proxy app that blocks 9050

This commit is contained in:
Nathan Freitas 2014-04-17 10:15:15 -04:00
parent 37eddfcbd2
commit 4c0d7ada8f
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,6 +99,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
mTorService = new Intent(this, TorService.class); mTorService = new Intent(this, TorService.class);
getApplication().getApplicationContext().startService(mTorService); getApplication().getApplicationContext().startService(mTorService);
appConflictChecker ();
} }
private void doLayout () private void doLayout ()
@ -278,6 +280,22 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
} }
private void appConflictChecker ()
{
String[] badApps = {"com.sec.msc.nts.android.proxy"};
for (String badApp : badApps)
{
if (appInstalledOrNot(badApp))
{
showAlert(getString(R.string.title_error),"Please uninstall or disable this app if you are having problems with Orbot: " + badApp,true);
break;
}
}
}
private void showAbout () private void showAbout ()