Do not run vpn watchdog when in non-VPN mode

Ch4t4r · Aug 20, 2021 · 821c6eb · 821c6eb
1 parent a5ae877
commit 821c6eb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/src/main/java/com/frostnerd/smokescreen/service/DnsVpnService.kt b/app/src/main/java/com/frostnerd/smokescreen/service/DnsVpnService.kt
@@ -1444,9 +1444,15 @@ class DnsVpnService : VpnService(), Runnable, CoroutineScope {
                     hideBadConnectionNotification()
                 }, logger = this@DnsVpnService.logger, advancedLogging = getPreferences().advancedLogging)
             }
-        vpnWatchdog = VpnWatchDog({
-            showVpnRevokedNotification()
-        }, this)
+        vpnWatchdog = if (!runInNonVpnMode) {
+            vpnWatchdog?.stop()
+            VpnWatchDog({
+                showVpnRevokedNotification()
+            }, this)
+        } else {
+            vpnWatchdog?.stop()
+            null
+        }
     }
 
     private fun createQueryLogger(): QueryListener? {

diff --git a/app/src/main/java/com/frostnerd/smokescreen/service/VpnWatchDog.kt b/app/src/main/java/com/frostnerd/smokescreen/service/VpnWatchDog.kt
@@ -26,7 +26,7 @@ import kotlinx.coroutines.*
  * You can contact the developer at daniel.wolf@frostnerd.com.
  */
 class VpnWatchDog(private val onVpnDisconnected:() -> Unit,
-                  private val context: Context) {
+                  context: Context) {
     private val supervisor = SupervisorJob()
     private val scope = CoroutineScope(supervisor + Dispatchers.IO)
     private var running = true