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

2.155 release

This commit is contained in:
M66B 2017-11-07 21:37:13 +01:00
parent 1e3965b58d
commit 286fcfefd5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -6,10 +6,10 @@ android {
defaultConfig {
applicationId = "eu.faircode.netguard"
versionName = "2.154"
versionName = "2.155"
minSdkVersion 22
targetSdkVersion 27
versionCode = 2017110703
versionCode = 2017110704
archivesBaseName = "NetGuard-v$versionName"
externalNativeBuild {

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

@ -1428,6 +1428,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
Log.i(TAG, "Running tunnel");
jni_run(vpn.getFd(), mapForward.containsKey(53), rcode);
Log.i(TAG, "Tunnel exited");
tunnelThread = null;
}
});
tunnelThread.setPriority(Thread.MAX_PRIORITY);
@ -1446,9 +1447,10 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
jni_stop();
while (true)
Thread thread = tunnelThread;
while (thread != null)
try {
tunnelThread.join();
thread.join();
break;
} catch (InterruptedException ignored) {
}