More tweaks

Signed-off-by: Percy Wegmann <percy@tailscale.com>

android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt

@@ -13,6 +13,7 @@ import com.tailscale.ipn.ui.util.DisplayAddress
 import com.tailscale.ipn.ui.util.TimeUtil
 import com.tailscale.ipn.ui.viewModel.PeerSettingInfo
 import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.JsonElement
 
 class Tailcfg {
   @Serializable
@@ -79,7 +80,7 @@ class Tailcfg {
       var LastSeen: Time? = null,
       var Online: Boolean? = null,
       var Capabilities: List<String>? = null,
-      var CapMap: Map<String, List<String>?>? = null,
+      var CapMap: Map<String, JsonElement?>? = null,
       var ComputedName: String,
       var ComputedNameWithHost: String
   ) {

android/src/main/java/com/tailscale/ipn/ui/notifier/Notifier.kt

@@ -17,7 +17,6 @@ import kotlinx.coroutines.launch
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.decodeFromStream
-import java.nio.charset.Charset
 
 // Notifier is a wrapper around the IPN Bus notifier.  It provides a way to watch
 // for changes in various parts of the Tailscale engine.  You will typically only use
@@ -68,7 +67,6 @@ object Notifier {
               NotifyWatchOpt.InitialState.value
       manager =
           app.watchNotifications(mask.toLong()) { notification ->
-            Log.d("ZZZZ", notification.toString(Charset.defaultCharset()))
             val notify = decoder.decodeFromStream<Notify>(notification.inputStream())
             notify.State?.let { state.set(Ipn.State.fromInt(it)) }
             notify.NetMap?.let(netmap::set)