Don't show OS peer info if unavailable

Signed-off-by: Percy Wegmann <percy@tailscale.com>
2 years ago · ed45a7650c
parent 74f8db62fb
commit ed45a7650c
1 changed files with 10 additions and 4 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
@ -120,10 +120,16 @@ class Tailcfg {
      }

    val info: List<PeerSettingInfo>
-      get() =
-          listOf(
-              PeerSettingInfo(R.string.os, ComposableStringFormatter(Hostinfo.OS ?: "")),
-              PeerSettingInfo(R.string.key_expiry, TimeUtil().keyExpiryFromGoTime(KeyExpiry)))
+      get() {
+        val result = mutableListOf<PeerSettingInfo>()
+        if (Hostinfo.OS?.isNotEmpty() == true) {
+          result.add(
+              PeerSettingInfo(R.string.os, ComposableStringFormatter(Hostinfo.OS!!)),
+          )
+        }
+        result.add(PeerSettingInfo(R.string.key_expiry, TimeUtil().keyExpiryFromGoTime(KeyExpiry)))
+        return result
+      }
  }

  @Serializable