From 98702ed92a543849006cb497aac3f55648d32045 Mon Sep 17 00:00:00 2001
From: Nick O'Neill <nick@tailscale.com>
Date: Mon, 8 Sep 2025 15:08:43 -0700
Subject: [PATCH] android: support tailnet display name, falling back to domain

Updates https://github.com/tailscale/corp/issues/30456

Signed-off-by: Nick O'Neill <nick@tailscale.com>
---
 .../main/java/com/tailscale/ipn/ui/model/TailCfg.kt    | 10 +++++++++-
 .../main/java/com/tailscale/ipn/ui/view/MainView.kt    |  4 ++--
 .../main/java/com/tailscale/ipn/ui/view/UserView.kt    |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

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 511011cdcd..658cb06533 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
@@ -188,7 +188,15 @@ class Tailcfg {
   data class Service(var Proto: String, var Port: Int, var Description: String? = null)
 
   @Serializable
-  data class NetworkProfile(var MagicDNSName: String? = null, var DomainName: String? = null)
+  data class NetworkProfile(
+      var MagicDNSName: String? = null,
+      var DomainName: String? = null,
+      var DisplayName: String? = null
+  ) {
+      fun tailnetNameForDisplay(): String? {
+          return DisplayName ?: DomainName
+      }
+  }
 
   @Serializable
   data class Location(
diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt
index 9b14cd9bec..6c11cc56a1 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt
@@ -167,7 +167,7 @@ fun MainView(
                   }
                 },
                 headlineContent = {
-                  user?.NetworkProfile?.DomainName?.let { domain ->
+                  user?.NetworkProfile?.tailnetNameForDisplay()?.let { domain ->
                     AutoResizingText(
                         text = domain,
                         style = MaterialTheme.typography.titleMedium.short,
@@ -500,7 +500,7 @@ fun ConnectView(
               fontWeight = FontWeight.SemiBold,
               textAlign = TextAlign.Center,
               fontFamily = MaterialTheme.typography.titleMedium.fontFamily)
-          val tailnetName = user.NetworkProfile?.DomainName ?: ""
+          val tailnetName = user.NetworkProfile?.tailnetNameForDisplay() ?: ""
           Text(
               buildAnnotatedString {
                 append(stringResource(id = R.string.connect_to_tailnet_prefix))
diff --git a/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt b/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt
index 0c2a3dc49b..10f52d8705 100644
--- a/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt
+++ b/android/src/main/java/com/tailscale/ipn/ui/view/UserView.kt
@@ -63,7 +63,7 @@ fun UserView(
           supportingContent = {
             Column {
               AutoResizingText(
-                  text = profile.NetworkProfile?.DomainName ?: "",
+                  text = profile.NetworkProfile?.tailnetNameForDisplay() ?: "",
                   style = MaterialTheme.typography.bodyMedium.short,
                   minFontSize = MaterialTheme.typography.minTextSize,
                   overflow = TextOverflow.Ellipsis)