fix: skip ping job for static configured tunnels

#741
fix: vpn permission bug
2026-07-03 14:07:49 +02:00 · 2025-04-28 17:35:31 -04:00 · 2025-04-28 16:07:01 -04:00 · 2025-04-28 15:17:55 -04:00 · 2025-04-28 15:06:43 -04:00
5 changed files with 36 additions and 8 deletions
@@ -134,6 +134,7 @@ class MainActivity : AppCompatActivity() {
                            vpnPermissionDenied = true
                        } else {
                            vpnPermissionDenied = false
+                            showVpnPermissionDialog = false
                        }
                    },
                )
@@ -208,7 +209,10 @@ class MainActivity : AppCompatActivity() {
                    WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
                        VpnDeniedDialog(
                            showVpnPermissionDialog,
-                            onDismiss = { showVpnPermissionDialog = false },
+                            onDismiss = {
+                                showVpnPermissionDialog = false
+                                vpnPermissionDenied = false
+                            },
                        )

                        Scaffold(
@@ -165,8 +165,12 @@ class TunnelForegroundService : LifecycleService() {
            } else {
                pingJobs[tun]?.cancel() // Cancel any stale job
                if (tun.isPingEnabled) {
-                    pingJobs[tun] = startPingJob(tun)
-                    Timber.d("Started ping job for ${tun.tunName}")
+                    if (tun.isStaticallyConfigured()) {
+                        Timber.d("Skipping ping for statically configured tunnel")
+                    } else {
+                        pingJobs[tun] = startPingJob(tun)
+                        Timber.d("Started ping job for ${tun.tunName}")
+                    }
                }
            }
        }
@@ -60,6 +60,10 @@ data class TunnelConf(
        return result
    }

+    fun isStaticallyConfigured(): Boolean {
+        return toAmConfig().peers.all { it.endpoint.get().host.isValidIpv4orIpv6Address() }
+    }
+
    fun copyWithCallback(
        id: Int = this.id,
        tunName: String = this.tunName,
@@ -52,8 +52,9 @@ fun InterfaceFields(
            if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
        trailingIcon = {
            IconButton(
-                enabled = isAuthenticated,
+                enabled = true,
                onClick = {
+                    if (!isAuthenticated) return@IconButton showAuthPrompt()
                    val keypair = com.wireguard.crypto.KeyPair()
                    onInterfaceChange(
                        interfaceState.copy(
@@ -1,14 +1,29 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions

-import java.util.regex.Pattern
 import timber.log.Timber

 val hasNumberInParentheses = """^(.+?)\((\d+)\)$""".toRegex()

 fun String.isValidIpv4orIpv6Address(): Boolean {
-    val ipv4Pattern = Pattern.compile("^(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\$")
-    val ipv6Pattern = Pattern.compile("^([0-9A-Fa-f]{1,4}:){7}[0-9A-Fa-f]{1,4}\$")
-    return ipv4Pattern.matcher(this).matches() || ipv6Pattern.matcher(this).matches()
+    val sanitized = removeSurrounding("[", "]")
+    val ipv6Pattern =
+        Regex(
+            "(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:)" +
+                "{1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]" +
+                "{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:" +
+                "[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4})" +
+                "{1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}" +
+                ":((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]" +
+                "{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}" +
+                "[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:)" +
+                "{1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))"
+        )
+    val ipv4Pattern =
+        Regex(
+            "^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}" +
+                "(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$"
+        )
+    return ipv4Pattern.matches(sanitized) || ipv6Pattern.matches(sanitized)
 }

 fun String.hasNumberInParentheses(): Boolean {
Author	SHA1	Message	Date
Zane Schepke	7af53dcc18	fix: skip ping job for static configured tunnels #741	2025-04-28 17:35:31 -04:00
Zane Schepke	2eb0ab0f19	fix: vpn permission bug closes #754	2025-04-28 16:07:01 -04:00
Zane Schepke	07857a53c2	fix: regenerate icon to also trigger auth closes #757	2025-04-28 15:17:55 -04:00
Zane Schepke	25fd31e252	fix: tunnel lock (#765 ) fix: start up logger bug refactor: switch to bound services refactor: expose resolved peer endpoint	2025-04-28 15:06:43 -04:00