Merge 1e372a8d2f into 83178b2d8f

3 days ago · 354f3aee41
parent 83178b2d8f 1e372a8d2f
commit 354f3aee41
1 changed files with 1 additions and 1 deletions
--- 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
    }
  }