mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed switching filtering on/off

This commit is contained in:
M66B 2016-01-28 23:07:51 +01:00
parent aac945cb17
commit da825d3c73
2 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -433,7 +433,6 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
SinkholeService.reload(null, "changed " + name, this);
} else if ("filter".equals(name)) {
// TODO pro feature
SinkholeService.reload(null, "changed " + name, this);
// Show dialog

29
app/src/main/java/eu/faircode/netguard/SinkholeService.java
View File

@ -84,10 +84,11 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
private boolean last_connected = false;
private boolean last_metered = true;
private boolean last_interactive = false;
private boolean last_tethering = false;
private boolean last_filter = false;
private String last_vpn4 = null;
private String last_vpn6 = null;
private String last_dns = null;
private boolean last_tethering = false;
private boolean phone_state = false;
private Object subscriptionsChangedListener = null;
private ParcelFileDescriptor vpn = null;
@ -232,6 +233,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
if (cmd != Command.stop)
if (!user_foreground) {
Log.i(TAG, "Command " + cmd + "ignored for background user");
return;
}
// Listen for phone state changes
@ -364,6 +366,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
List<Rule> listAllowed = getAllowedRules(listRule);
if (filter &&
filter == last_filter &&
tethering == last_tethering &&
vpn4.equals(last_vpn4) &&
vpn6.equals(last_vpn6) &&
@ -371,7 +374,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
Log.i(TAG, "Native restart");
if (vpn != null)
jni_stop(vpn.getFd(), false);
stopNative(vpn, false);
if (vpn == null)
vpn = startVPN(listAllowed);
@ -396,7 +399,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
}
if (prev != null) {
jni_stop(prev.getFd(), false);
stopNative(prev, false);
stopVPN(prev);
}
startNative(vpn, listAllowed);
@ -407,7 +410,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
private void stop() {
if (vpn != null) {
jni_stop(vpn.getFd(), true);
stopNative(vpn, true);
stopVPN(vpn);
vpn = null;
}
@ -701,10 +704,11 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
boolean tethering = prefs.getBoolean("tethering", false);
boolean filter = prefs.getBoolean("filter", false);
last_filter = filter;
last_tethering = tethering;
last_vpn4 = prefs.getString("vpn4", "10.1.10.1");
last_vpn6 = prefs.getString("vpn6", "fd00:1:fd00:1:fd00:1:fd00:1");
last_dns = getDns();
last_tethering = tethering;
// Build VPN service
final Builder builder = new Builder();
@ -769,17 +773,26 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
}
private void startNative(ParcelFileDescriptor vpn, List<Rule> listAllowed) {
prepareAllowed(listAllowed);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SinkholeService.this);
boolean log = prefs.getBoolean("log", false);
boolean filter = prefs.getBoolean("filter", false);
Log.i(TAG, "Start native log=" + log + " filter=" + filter);
// Prepare allowed/blocked lists
prepareAllowed(listAllowed);
if (log || filter) {
int prio = Integer.parseInt(prefs.getString("loglevel", Integer.toString(Log.INFO)));
jni_start(vpn.getFd(), prio);
}
}
private void stopNative(ParcelFileDescriptor vpn, boolean clear) {
Log.i(TAG, "Stop native clear=" + clear);
jni_stop(vpn.getFd(), clear);
}
private void prepareAllowed(List<Rule> listAllowed) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SinkholeService.this);
boolean use_hosts = prefs.getBoolean("use_hosts", false);
@ -1235,7 +1248,7 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
try {
if (vpn != null) {
jni_stop(vpn.getFd(), true);
stopNative(vpn, true);
stopVPN(vpn);
vpn = null;
}