commit d5f2c063b53ff0392f5972ecb1976c097c0f3933 Author: Nathan Freitas nathan@freitas.net Date: Thu Sep 29 12:00:40 2016 -0400

remove vpn code that is now in the service module --- .../main/java/org/torproject/android/OrbotApp.java | 17 ----------- app/src/main/res/values/pdnsd.xml | 33 ---------------------- 2 files changed, 50 deletions(-)

diff --git a/app/src/main/java/org/torproject/android/OrbotApp.java b/app/src/main/java/org/torproject/android/OrbotApp.java index 3b1593f..cbf118b 100644 --- a/app/src/main/java/org/torproject/android/OrbotApp.java +++ b/app/src/main/java/org/torproject/android/OrbotApp.java @@ -22,8 +22,6 @@ public class OrbotApp extends Application implements OrbotConstants

private Locale locale;

- private OrbotVpnManager mVpnManager = null; - @Override public void onCreate() { super.onCreate(); @@ -35,21 +33,6 @@ public class OrbotApp extends Application implements OrbotConstants

}

- @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) - public boolean startVPN (VpnService service, int port) - { - - mVpnManager = new OrbotVpnManager(service); - - Intent intent = new Intent(); - intent.setAction("start"); - intent.putExtra("torSocks", port); - - // mVpnManager.handleIntent(new VpnService.Builder(),intent); - - return true; - } - @Override public void onConfigurationChanged(Configuration newConfig) { super.onConfigurationChanged(newConfig); diff --git a/app/src/main/res/values/pdnsd.xml b/app/src/main/res/values/pdnsd.xml deleted file mode 100644 index 522f765..0000000 --- a/app/src/main/res/values/pdnsd.xml +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - <string name="pdnsd_conf" formatted="false"> -global { - perm_cache=0; - cache_dir="/data/data/org.torproject.android/app_bin"; - server_port = 8091; - server_ip = 0.0.0.0; - query_method=udp_only; - min_ttl=15m; - max_ttl=1w; - timeout=10; - daemon=on; - pid_file="/data/data/org.torproject.android/app_bin/pdnsd.pid"; - -} - -server { - label= "upstream"; - ip = %s; - port = %d; - uptest = none; -} - -rr { - name=localhost; - reverse=on; - a=127.0.0.1; - owner=localhost; - soa=localhost,root.localhost,42,86400,900,86400,86400; -} - </string> -</resources>