Remove watchdog

This functionality is handled by the connectivity callback and is prone to unexpected behavior

Author: t895

app/src/main/kotlin/dev/clombardo/dnsnet/ui/Home.kt

@@ -726,7 +726,6 @@ fun HomeScreen(
             composable<HomeDestinations.Start> {
                 vm.showStatusBarShade()
                 var resumeOnStartup by remember { mutableStateOf(config.autoStart) }
-                var watchConnection by remember { mutableStateOf(config.watchDog) }
                 var ipv6Support by remember { mutableStateOf(config.ipV6Support) }
                 var blockLog by remember { mutableStateOf(config.blockLogging) }
 
@@ -765,13 +764,6 @@ fun HomeScreen(
                         resumeOnStartup = config.autoStart
                         config.save()
                     },
-                    watchConnection = watchConnection,
-                    onWatchConnectionClick = {
-                        config.watchDog = !config.watchDog
-                        watchConnection = config.watchDog
-                        config.save()
-                        onRestartService()
-                    },
                     ipv6Support = ipv6Support,
                     onIpv6SupportClick = {
                         config.ipV6Support = !config.ipV6Support

app/src/main/kotlin/dev/clombardo/dnsnet/ui/Start.kt

@@ -68,8 +68,6 @@ fun StartScreen(
     listState: LazyGridState = rememberLazyGridState(),
     resumeOnStartup: Boolean,
     onResumeOnStartupClick: () -> Unit,
-    watchConnection: Boolean,
-    onWatchConnectionClick: () -> Unit,
     ipv6Support: Boolean,
     onIpv6SupportClick: () -> Unit,
     blockLog: Boolean,
@@ -159,12 +157,6 @@ fun StartScreen(
                         checked = resumeOnStartup,
                         onCheckedChange = { onResumeOnStartupClick() },
                     )
-                    SwitchListItem(
-                        title = stringResource(id = R.string.watchdog),
-                        details = stringResource(id = R.string.watchdog_description),
-                        checked = watchConnection,
-                        onCheckedChange = { onWatchConnectionClick() },
-                    )
                     SwitchListItem(
                         title = stringResource(id = R.string.ipv6_support),
                         details = stringResource(id = R.string.ipv6_support_description),
@@ -230,8 +222,6 @@ private fun StartScreenPreview() {
             modifier = Modifier.background(MaterialTheme.colorScheme.surface),
             resumeOnStartup = false,
             onResumeOnStartupClick = {},
-            watchConnection = false,
-            onWatchConnectionClick = {},
             ipv6Support = false,
             onIpv6SupportClick = {},
             status = VpnStatus.STOPPED,

app/src/main/kotlin/dev/clombardo/dnsnet/vpn/AdVpnThread.kt

@@ -102,8 +102,6 @@ class AdVpnThread(
     /* Upstream DNS servers, indexed by our IP */
     private val upstreamDnsServers = ArrayList<InetAddress>()
 
-    private var watchdogTarget: InetAddress? = null
-
     internal data class ThreadData(
         val thread: Thread,
         val vpnController: VpnController
@@ -204,10 +202,8 @@ class AdVpnThread(
             hostItems = config.hosts.items.map { it.toNative() },
             hostExceptions = config.hosts.exceptions.map { it.toNative() },
             upstreamDnsServers = upstreamDnsServers.map { it.address },
-            watchdogTargetAddress = watchdogTarget?.hostAddress ?: "",
             vpnFd = vpnFd,
             vpnController = threadData!!.vpnController,
-            watchdogEnabled = config.watchDog
         )
     }
 
@@ -229,14 +225,12 @@ class AdVpnThread(
             val alias = String.format(format!!, upstreamDnsServers.size + 1)
             logi("configure: Adding DNS Server $addr as $alias")
             builder.addDnsServer(alias).addRoute(alias, 32)
-            watchdogTarget = InetAddress.getByName(alias)
         } else if (addr is Inet6Address) {
             upstreamDnsServers.add(addr)
             ipv6Template!![ipv6Template.size - 1] = (upstreamDnsServers.size + 1).toByte()
             val i6addr = Inet6Address.getByAddress(ipv6Template)
             logi("configure: Adding DNS Server $addr as $i6addr")
             builder.addDnsServer(i6addr)
-            watchdogTarget = i6addr
         }
     }