Skip to content

android: stop watching legacy netmap notifications #797

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bradfitz merged 1 commit into from
May 27, 2026
Merged

android: stop watching legacy netmap notifications #797

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion android/src/main/java/com/tailscale/ipn/ui/model/Ipn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,11 @@ class Ipn {
val OutgoingFiles: List<OutgoingFile>? = null,
val State: Int? = null,
var Prefs: Prefs? = null,
var NetMap: Netmap.NetworkMap? = null,
var SelfChange: Tailcfg.Node? = null,
var InitialStatus: IpnState.Status? = null,
var PeersChanged: List<Tailcfg.Node>? = null,
var PeersRemoved: List<NodeID>? = null,
var UserProfiles: Map<String, Tailcfg.UserProfile>? = null,
var Engine: EngineStatus? = null,
var BrowseToURL: String? = null,
var BackendLogId: String? = null,
Expand Down
41 changes: 25 additions & 16 deletions android/src/main/java/com/tailscale/ipn/ui/model/IpnState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,25 +17,34 @@ class IpnState {

@Serializable
data class PeerStatus(
val ID: StableNodeID,
val HostName: String,
val DNSName: String,
val ID: StableNodeID = "",
val NodeID: NodeID = 0,
val PublicKey: KeyNodePublic = "",
val HostName: String = "",
val DNSName: String = "",
val OS: String = "",
val UserID: UserID = 0,
val AltSharerUserID: UserID = 0,
val TailscaleIPs: List<Addr>? = null,
val AllowedIPs: List<Prefix>? = null,
val Tags: List<String>? = null,
val PrimaryRoutes: List<String>? = null,
val Addrs: List<String>? = null,
val CurAddr: String? = null,
val Relay: String? = null,
val PeerRelay: String? = null,
val Online: Boolean,
val ExitNode: Boolean,
val ExitNodeOption: Boolean,
val Active: Boolean,
val LastSeen: String? = null,
val Online: Boolean = false,
val ExitNode: Boolean = false,
val ExitNodeOption: Boolean = false,
val Active: Boolean = false,
val PeerAPIURL: List<String>? = null,
val Capabilities: List<String>? = null,
val CapMap: Map<String, kotlinx.serialization.json.JsonElement?>? = null,
val SSH_HostKeys: List<String>? = null,
val ShareeNode: Boolean? = null,
val Expired: Boolean? = null,
val KeyExpiry: String? = null,
val Location: Tailcfg.Location? = null,
) {
fun computedName(status: Status): String {
Expand All @@ -54,24 +63,24 @@ class IpnState {

@Serializable
data class ExitNodeStatus(
val ID: StableNodeID,
val Online: Boolean,
val ID: StableNodeID = "",
val Online: Boolean = false,
val TailscaleIPs: List<Prefix>? = null,
)

@Serializable
data class TailnetStatus(
val Name: String,
val MagicDNSSuffix: String,
val MagicDNSEnabled: Boolean,
val Name: String = "",
val MagicDNSSuffix: String = "",
val MagicDNSEnabled: Boolean = false,
)

@Serializable
data class Status(
val Version: String,
val TUN: Boolean,
val BackendState: String,
val AuthURL: String,
val Version: String = "",
val TUN: Boolean = false,
val BackendState: String = "",
val AuthURL: String = "",
val TailscaleIPs: List<Addr>? = null,
val Self: PeerStatus? = null,
val ExitNodeStatus: ExitNodeStatus? = null,
Expand Down
22 changes: 11 additions & 11 deletions android/src/main/java/com/tailscale/ipn/ui/model/TailCfg.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ class Tailcfg {

@Serializable
data class UserProfile(
val ID: Long,
val DisplayName: String,
val LoginName: String,
val ID: Long = 0,
val DisplayName: String = "",
val LoginName: String = "",
val ProfilePicURL: String? = null,
) {
fun isTaggedDevice(): Boolean {
Expand Down Expand Up @@ -68,23 +68,23 @@ class Tailcfg {

@Serializable
data class Node(
var ID: NodeID,
var StableID: StableNodeID,
var Name: String,
var User: UserID,
var ID: NodeID = 0,
var StableID: StableNodeID = "",
var Name: String = "",
var User: UserID = 0,
var Sharer: UserID? = null,
var Key: KeyNodePublic,
var Key: KeyNodePublic = "",
var KeyExpiry: String? = null,
var Addresses: List<Prefix>? = null,
var AllowedIPs: List<Prefix>? = null,
var Endpoints: List<String>? = null,
var Hostinfo: Hostinfo,
var Hostinfo: Hostinfo = Hostinfo(),
var LastSeen: Time? = null,
var Online: Boolean? = null,
var Capabilities: List<String>? = null,
var CapMap: Map<String, JsonElement?>? = null,
var ComputedName: String?,
var ComputedNameWithHost: String?
var ComputedName: String? = null,
var ComputedNameWithHost: String? = null
) {
val isAdmin: Boolean
get() =
Expand Down
Loading
Loading