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

Always clear on reload

This commit is contained in:
M66B 2019-08-03 19:58:24 +02:00
parent 641ad7dff6
commit aadb1e44b4
3 changed files with 10 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
View File

@ -534,7 +534,6 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ServiceSinkhole.this);
boolean clear = prefs.getBoolean("clear_onreload", false);
if (state != State.enforcing) {
if (state != State.none) {
@ -554,7 +553,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
Log.i(TAG, "Legacy restart");
if (vpn != null) {
stopNative(vpn, clear);
stopNative(vpn);
stopVPN(vpn);
vpn = null;
try {
@ -567,7 +566,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
} else {
if (vpn != null && prefs.getBoolean("filter", false) && builder.equals(last_builder)) {
Log.i(TAG, "Native restart");
stopNative(vpn, clear);
stopNative(vpn);
} else {
last_builder = builder;
@ -582,7 +581,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
if (prev != null && vpn == null) {
Log.w(TAG, "Handover failed");
stopNative(prev, clear);
stopNative(prev);
stopVPN(prev);
prev = null;
try {
@ -595,12 +594,12 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
}
if (prev != null) {
stopNative(prev, clear);
stopNative(prev);
stopVPN(prev);
}
} else {
if (vpn != null) {
stopNative(vpn, clear);
stopNative(vpn);
stopVPN(vpn);
}
@ -620,7 +619,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
private void stop(boolean temporary) {
if (vpn != null) {
stopNative(vpn, true);
stopNative(vpn);
stopVPN(vpn);
vpn = null;
unprepare();
@ -1517,8 +1516,8 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
}
}
private void stopNative(ParcelFileDescriptor vpn, boolean clear) {
Log.i(TAG, "Stop native clear=" + clear);
private void stopNative(ParcelFileDescriptor vpn) {
Log.i(TAG, "Stop native");
if (tunnelThread != null) {
Log.i(TAG, "Stopping tunnel thread");
@ -1537,8 +1536,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
}
tunnelThread = null;
if (clear)
jni_clear(jni_context);
jni_clear(jni_context);
Log.i(TAG, "Stopped tunnel thread");
}
@ -2755,7 +2753,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
try {
if (vpn != null) {
stopNative(vpn, true);
stopNative(vpn);
stopVPN(vpn);
vpn = null;
unprepare();

5
app/src/main/res/xml-v14/preferences.xml
View File

@ -187,11 +187,6 @@
android:dependency="filter"
android:key="handover"
android:title="@string/setting_handover" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="filter"
android:key="clear_onreload"
android:title="@string/setting_clear_onreload" />
<CheckBoxPreference
android:defaultValue="false"
android:dependency="filter"

5
app/src/main/res/xml-v21/preferences.xml
View File

@ -187,11 +187,6 @@
android:dependency="filter"
android:key="handover"
android:title="@string/setting_handover" />
<eu.faircode.netguard.SwitchPreference
android:defaultValue="false"
android:dependency="filter"
android:key="clear_onreload"
android:title="@string/setting_clear_onreload" />
<eu.faircode.netguard.SwitchPreference
android:defaultValue="false"
android:dependency="filter"