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

remove vpn code that is now in the service module

This commit is contained in:
Nathan Freitas 2016-09-29 12:00:40 -04:00
parent 34c7cfd2e1
commit d5f2c063b5
2 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/org/torproject/android/OrbotApp.java
View File

@ -22,8 +22,6 @@ public class OrbotApp extends Application implements OrbotConstants
private Locale locale; private Locale locale;
private OrbotVpnManager mVpnManager = null;
@Override @Override
public void onCreate() { public void onCreate() {
super.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 @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);

33
app/src/main/res/values/pdnsd.xml
View File

@ -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>