[tor-commits] [orbot/master] check for evil samsung proxy app that blocks 9050

[n8fr8 at torproject.org]

commit 4c0d7ada8fa332b12f5a5a5bba454b60ebbe6984
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Apr 17 10:15:15 2014 -0400

    check for evil samsung proxy app that blocks 9050
---
 src/org/torproject/android/Orbot.java |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java
index 43a797d..5e68e92 100644
--- a/src/org/torproject/android/Orbot.java
+++ b/src/org/torproject/android/Orbot.java
@@ -98,6 +98,8 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic
 
     	mTorService = new Intent(this, TorService.class);
     	getApplication().getApplicationContext().startService(mTorService);
+    	
+    	appConflictChecker ();
         
 	}
 	
@@ -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 ()