android: account for DisplayName being an empty string (#725)

Erisa · web-flow · commit d0442f75daba · 2026-01-05T08:51:49.000-05:00
Fixes tailscale/tailscale#18284 Signed-off-by: Erisa A <erisa@tailscale.com>
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
@@ -195,7 +195,7 @@ class Tailcfg {
       var DisplayName: String? = null
   ) {
     fun tailnetNameForDisplay(): String? {
-      return DisplayName ?: DomainName
+      return DisplayName?.takeIf { it.isNotEmpty() } ?: DomainName
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ class Tailcfg {`
`195`	`195`	`var DisplayName: String? = null`
`196`	`196`	`) {`
`197`	`197`	`fun tailnetNameForDisplay(): String? {`
`198`		`- return DisplayName ?: DomainName`
	`198`	`+ return DisplayName?.takeIf { it.isNotEmpty() } ?: DomainName`
`199`	`199`	`}`
`200`	`200`	`}`
`201`	`201`