From caaf936bcbb83d193485814124a078de01aaee56 Mon Sep 17 00:00:00 2001
From: M66B <marcel@faircode.eu>
Date: Wed, 18 Nov 2015 15:25:32 +0100
Subject: [PATCH] Check VpnService.Builder.establish result

---
 .../java/eu/faircode/netguard/SinkholeService.java  | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/netguard/SinkholeService.java b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
index 4e291d5c..8c6d770a 100644
--- a/app/src/main/java/eu/faircode/netguard/SinkholeService.java
+++ b/app/src/main/java/eu/faircode/netguard/SinkholeService.java
@@ -109,12 +109,8 @@ public class SinkholeService extends VpnService {
                         vpn = startVPN();
                         startDebug(vpn);
                     }
-                    if (vpn == null)
-                        prefs.edit().putBoolean("enabled", false).apply();
-                    else {
-                        removeDisabledNotification();
-                        Widget.updateWidgets(SinkholeService.this);
-                    }
+                    removeDisabledNotification();
+                    Widget.updateWidgets(SinkholeService.this);
                     break;
 
                 case reload:
@@ -193,7 +189,10 @@ public class SinkholeService extends VpnService {
 
         // Start VPN service
         try {
-            return builder.establish();
+            ParcelFileDescriptor result = builder.establish();
+            if (result == null)
+                throw new IllegalStateException("VpnService.Builder.establish returned unexpectedly NULL");
+            return result;
 
         } catch (Throwable ex) {
             Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));