From e3c76eb8126179fc709b12f6c0521c9bd3bf1314 Mon Sep 17 00:00:00 2001 From: kari-ts <135075563+kari-ts@users.noreply.github.com> Date: Tue, 20 May 2025 10:42:21 -0700 Subject: [PATCH] android: fix isExitNode check (#646) && takes precedence over ?:, so fix isExitNode to check both IPv4 and IPv6 Updates tailscale/tailscale#15785 Signed-off-by: kari-ts --- android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt b/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt index f79b89d..a51579e 100644 --- a/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt +++ b/android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt @@ -105,7 +105,7 @@ class Tailcfg { // isExitNode reproduces the Go logic in local.go peerStatusFromNode val isExitNode: Boolean = - AllowedIPs?.contains("0.0.0.0/0") ?: false && AllowedIPs?.contains("::/0") ?: false + (AllowedIPs?.contains("0.0.0.0/0") ?: false) && (AllowedIPs?.contains("::/0") ?: false) val isMullvadNode: Boolean get() = Name.endsWith(".mullvad.ts.net.")