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

Synchronize JNI done

This commit is contained in:
M66B 2019-07-23 20:46:43 +02:00
parent bbd12a7386
commit 4c8d1d89d1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
private int last_blocked = -1;
private int last_hosts = -1;
private static Object jni_lock = new Object();
private static long jni_context = 0;
private Thread tunnelThread = null;
private ServiceSinkhole.Builder last_builder = null;
@ -2352,8 +2353,10 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
if (jni_context != 0) {
jni_stop(jni_context);
jni_done(jni_context);
jni_context = 0;
synchronized (jni_lock) {
jni_done(jni_context);
jni_context = 0;
}
}
// Native init
@ -2718,7 +2721,10 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
}
jni_done(jni_context);
synchronized (jni_lock) {
jni_done(jni_context);
jni_context = 0;
}
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
prefs.unregisterOnSharedPreferenceChangeListener(this);