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

Try to workaround handover fail 

https://code.google.com/p/android/issues/detail?id=62410
This commit is contained in:
M66B 2016-02-15 20:24:11 +01:00
parent e92b51643b
commit 902a0de9a0
1 changed files with 34 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -370,22 +370,43 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS
List<Rule> listRule = Rule.getRules(true, SinkholeService.this); List<Rule> listRule = Rule.getRules(true, SinkholeService.this);
List<Rule> listAllowed = getAllowedRules(listRule); List<Rule> listAllowed = getAllowedRules(listRule);
// Attempt seamless handover if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) {
ParcelFileDescriptor prev = vpn; if (vpn != null) {
vpn = startVPN(listAllowed); stopNative(vpn, false);
if (prev != null && vpn == null) { stopVPN(vpn);
Log.w(TAG, "Handover failed"); vpn = null;
stopVPN(prev); try {
prev = null; Thread.sleep(3000);
} catch (InterruptedException ignored) {
}
}
vpn = startVPN(listAllowed); vpn = startVPN(listAllowed);
if (vpn == null)
throw new IllegalStateException("Handover failed"); } else {
// Attempt seamless handover
ParcelFileDescriptor prev = vpn;
vpn = startVPN(listAllowed);
if (prev != null && vpn == null) {
Log.w(TAG, "Handover failed");
stopNative(prev, false);
stopVPN(prev);
prev = null;
try {
Thread.sleep(3000);
} catch (InterruptedException ignored) {
}
vpn = startVPN(listAllowed);
if (vpn == null)
throw new IllegalStateException("Handover failed");
}
if (prev != null) {
stopNative(prev, false);
stopVPN(prev);
}
} }
if (prev != null) {
stopNative(prev, false);
stopVPN(prev);
}
if (vpn == null) if (vpn == null)
throw new IllegalStateException("VPN start failed"); throw new IllegalStateException("VPN start failed");