fix: remove screen on intent

fix: error handling
refactor: expose resolved endpoint

app/src/main/java/com/zaneschepke/wireguardautotunnel/MainActivity.kt

@@ -134,7 +134,6 @@ class MainActivity : AppCompatActivity() {
                             vpnPermissionDenied = true
                         } else {
                             vpnPermissionDenied = false
-                            showVpnPermissionDialog = false
                         }
                     },
                 )
@@ -209,10 +208,7 @@ class MainActivity : AppCompatActivity() {
                     WireguardAutoTunnelTheme(theme = appUiState.appState.theme) {
                         VpnDeniedDialog(
                             showVpnPermissionDialog,
-                            onDismiss = {
-                                showVpnPermissionDialog = false
-                                vpnPermissionDenied = false
-                            },
+                            onDismiss = { showVpnPermissionDialog = false },
                         )
 
                         Scaffold(

app/src/main/java/com/zaneschepke/wireguardautotunnel/core/service/TunnelForegroundService.kt

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

app/src/main/java/com/zaneschepke/wireguardautotunnel/domain/entity/TunnelConf.kt

@@ -60,10 +60,6 @@ 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,

app/src/main/java/com/zaneschepke/wireguardautotunnel/ui/screens/main/config/components/InterfaceFields.kt

@@ -52,9 +52,8 @@ fun InterfaceFields(
             if (isAuthenticated) VisualTransformation.None else PasswordVisualTransformation(),
         trailingIcon = {
             IconButton(
-                enabled = true,
+                enabled = isAuthenticated,
                 onClick = {
-                    if (!isAuthenticated) return@IconButton showAuthPrompt()
                     val keypair = com.wireguard.crypto.KeyPair()
                     onInterfaceChange(
                         interfaceState.copy(

app/src/main/java/com/zaneschepke/wireguardautotunnel/util/extensions/StringExtensions.kt

@@ -1,29 +1,14 @@
 package com.zaneschepke.wireguardautotunnel.util.extensions
 
+import java.util.regex.Pattern
 import timber.log.Timber
 
 val hasNumberInParentheses = """^(.+?)\((\d+)\)$""".toRegex()
 
 fun String.isValidIpv4orIpv6Address(): Boolean {
-    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)
+    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()
 }
 
 fun String.hasNumberInParentheses(): Boolean {