From 1e372a8d2f7ef5b5333072ee727ef2012d4411e7 Mon Sep 17 00:00:00 2001
From: Erisa A <erisa@tailscale.com>
Date: Fri, 26 Dec 2025 12:51:14 +0000
Subject: [PATCH] android: account for DisplayName being an empty string

Fixes tailscale/tailscale#18284

Signed-off-by: Erisa A <erisa@tailscale.com>
---
 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 a513906..0b353d8 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
@@ -195,7 +195,7 @@ class Tailcfg {
       var DisplayName: String? = null
   ) {
     fun tailnetNameForDisplay(): String? {
-      return DisplayName ?: DomainName
+      return DisplayName?.takeIf { it.isNotEmpty() } ?: DomainName
     }
   }