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

added check for trans proxy preference 

svn:r21749
This commit is contained in:
Nathan Freitas 2010-02-24 05:09:24 +00:00
parent 6db137d9b5
commit 8c177d4725
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,8 +63,8 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setTheme(android.R.style.Theme_Black); setTheme(android.R.style.Theme_Black_NoTitleBar);
setTitle(getString(R.string.app_name) + ' ' + getString(R.string.app_version)); //setTitle(getString(R.string.app_name) + ' ' + getString(R.string.app_version));
showMain(); showMain();
} }
@ -329,6 +329,8 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
boolean autoUpdateBridges = prefs.getBoolean(PREF_BRIDGES_UPDATED, false); boolean autoUpdateBridges = prefs.getBoolean(PREF_BRIDGES_UPDATED, false);
enableTransparentProxy = prefs.getBoolean(PREF_TRANSPARENT, false);
String bridgeList = prefs.getString(PREF_BRIDGES_LIST,""); String bridgeList = prefs.getString(PREF_BRIDGES_LIST,"");
if (useBridges) if (useBridges)
@ -496,7 +498,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
processSettings(); processSettings();
mService.setProfile(PROFILE_ON); mService.setProfile(PROFILE_ON);
if (hasRoot) if (hasRoot && enableTransparentProxy)
{ {
TorRoot.enableDNSProxying(); TorRoot.enableDNSProxying();
TorRoot.enabledWebProxying(); TorRoot.enabledWebProxying();
@ -507,7 +509,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
mService.setProfile(PROFILE_ONDEMAND); mService.setProfile(PROFILE_ONDEMAND);
if (hasRoot) if (hasRoot && enableTransparentProxy)
{ {
TorRoot.purgeNatIptables(); TorRoot.purgeNatIptables();
} }
@ -606,6 +608,7 @@ public class Orbot extends Activity implements OnClickListener, TorConstants
boolean mIsBound = false; boolean mIsBound = false;
boolean hasRoot = false; boolean hasRoot = false;
boolean enableTransparentProxy = false;
private void bindService () private void bindService ()
{ {

3
Orbot/src/org/torproject/android/TorConstants.java
View File

@ -34,4 +34,7 @@ public interface TorConstants {
public final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_ENABLED = "pref_bridges_enabled";
public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled"; public final static String PREF_BRIDGES_UPDATED = "pref_bridges_enabled";
public final static String PREF_BRIDGES_LIST = "pref_bridges_list"; public final static String PREF_BRIDGES_LIST = "pref_bridges_list";
public final static String PREF_TRANSPARENT = "pref_transparent";
} }

29
Orbot/src/org/torproject/android/service/TorRoot.java
View File

@ -5,6 +5,12 @@ package org.torproject.android.service;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.OutputStreamWriter; import java.io.OutputStreamWriter;
import java.util.Iterator;
import java.util.List;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.util.Log; import android.util.Log;
/** /**
@ -227,4 +233,27 @@ public final class TorRoot {
exec = null; exec = null;
} }
} }
public void getApps (Context context)
{
PackageManager pMgr = context.getPackageManager();
List<ApplicationInfo> lAppInfo = pMgr.getInstalledApplications(0);
Iterator<ApplicationInfo> itAppInfo = lAppInfo.iterator();
ApplicationInfo aInfo = null;
while (itAppInfo.hasNext())
{
aInfo = itAppInfo.next();
boolean appEnabled = aInfo.enabled;
int uid = aInfo.uid; //-m owner --uid-owner
String username = pMgr.getNameForUid(uid);
String procName = aInfo.processName;
String name = aInfo.name;
}
}
} }