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

only load GeoIP when you need it

This commit is contained in:
Nathan Freitas 2012-01-12 21:53:30 -05:00
parent f9dd487389
commit ce0ea902ca
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/torproject/android/service/TorService.java
View File

@ -1309,9 +1309,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst
boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false);
boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false); boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false);
String entranceNodes = prefs.getString("pref_entrance_nodes", null); String entranceNodes = prefs.getString("pref_entrance_nodes", "");
String exitNodes = prefs.getString("pref_exit_nodes", null); String exitNodes = prefs.getString("pref_exit_nodes", "");
String excludeNodes = prefs.getString("pref_exclude_nodes", null); String excludeNodes = prefs.getString("pref_exclude_nodes", "");
String proxyType = prefs.getString("pref_proxy_type", null); String proxyType = prefs.getString("pref_proxy_type", null);
if (proxyType != null) if (proxyType != null)
@ -1325,13 +1325,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst
} }
} }
File fileGeoIP = new File(appBinHome,"geoip"); if (entranceNodes.length() > 0 || exitNodes.length() > 0 || excludeNodes.length() > 0)
mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false); {
//only apple GeoIP if you need it
File fileGeoIP = new File(appBinHome,"geoip");
mBinder.updateConfiguration("GeoIPFile", fileGeoIP.getAbsolutePath(), false);
}
mBinder.updateConfiguration("EntryNodes", entranceNodes, false); mBinder.updateConfiguration("EntryNodes", entranceNodes, false);
mBinder.updateConfiguration("ExitNodes", exitNodes, false); mBinder.updateConfiguration("ExitNodes", exitNodes, false);
mBinder.updateConfiguration("ExcludeNodes", excludeNodes, false); mBinder.updateConfiguration("ExcludeNodes", excludeNodes, false);
mBinder.updateConfiguration("StrictNodes", enableStrictNodes ? "1" : "0", false); mBinder.updateConfiguration("StrictNodes", enableStrictNodes ? "1" : "0", false);
if (useBridges) if (useBridges)
{ {
String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,""); String bridgeList = prefs.getString(TorConstants.PREF_BRIDGES_LIST,"");