From 1b8ca1cdc6c67ba26f9c37663ee49041ecdd35aa Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 15 Aug 2017 06:46:17 +0200
Subject: [PATCH] Prevent lingering wake locks

---
 app/src/main/AndroidManifest.xml                    |  2 +-
 .../java/eu/faircode/netguard/ServiceSinkhole.java  | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index cff4943e..07873a7e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -85,7 +85,7 @@
                     android:host="www.netguard.me"
                     android:pathPrefix="/"
                     android:scheme="https" />
-            </intent-filter>
+            </intent-filter>`
 
             <meta-data
                 android:name="android.app.shortcuts"
diff --git a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
index 9f184f08..bf34bc68 100644
--- a/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
+++ b/app/src/main/java/eu/faircode/netguard/ServiceSinkhole.java
@@ -237,6 +237,14 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
         return wlInstance;
     }
 
+    synchronized private static void releaseLock(Context context) {
+        if (wlInstance != null) {
+            while (wlInstance.isHeld())
+                wlInstance.release();
+            wlInstance = null;
+        }
+    }
+
     private final class CommandHandler extends Handler {
         public int queue = 0;
 
@@ -433,7 +441,7 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
 
                 // Stop service if needed
                 if (!prefs.getBoolean("enabled", false) && !prefs.getBoolean("show_stats", false))
-                    stopSelf();
+                    stopForeground(true);
 
             } catch (Throwable ex) {
                 Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
@@ -2402,6 +2410,9 @@ public class ServiceSinkhole extends VpnService implements SharedPreferences.OnS
         logLooper.quit();
         statsLooper.quit();
 
+        commandHandler.removeMessages(MSG_SERVICE_INTENT);
+        releaseLock(this);
+
         // Registered in command loop
         if (registeredInteractiveState) {
             unregisterReceiver(interactiveStateReceiver);