From 4e7eb2674c741931ea1a8541f5749ad3f20fcb65 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 29 Feb 2016 13:51:46 +0100 Subject: [PATCH] Rebuild on legacy restart --- .../main/java/eu/faircode/netguard/SinkholeService.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java index 46450407..39e66754 100644 --- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java +++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java @@ -408,10 +408,13 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS List listRule = Rule.getRules(true, SinkholeService.this); List listAllowed = getAllowedRules(listRule); + SinkholeService.Builder builder = getBuilder(listAllowed, listRule); if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP_MR1) { + last_builder = builder; + Log.i(TAG, "Legacy restart"); + if (vpn != null) { - Log.i(TAG, "Legacy restart"); stopNative(vpn, false); stopVPN(vpn); vpn = null; @@ -420,11 +423,9 @@ public class SinkholeService extends VpnService implements SharedPreferences.OnS } catch (InterruptedException ignored) { } } - last_builder = getBuilder(listAllowed, listRule); vpn = startVPN(last_builder); } else { - SinkholeService.Builder builder = getBuilder(listAllowed, listRule); if (prefs.getBoolean("filter", false) && builder.equals(last_builder)) { Log.i(TAG, "Native restart"); stopNative(vpn, false);