Merge nucleic/dusky-slate-newt-1i5r into dev
This commit is contained in:
@@ -59,7 +59,7 @@ struct SettingsView: View {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Section("Connection") {
|
Section("Connection") {
|
||||||
LabeledContent("Status", value: store.connectivity.label)
|
LabeledContent("Status", value: Self.statusLabel(store.connectivity))
|
||||||
// What this pairing can dial — the live transport is in Status above.
|
// What this pairing can dial — the live transport is in Status above.
|
||||||
if let host = IdentityStore.loadPairedHost() {
|
if let host = IdentityStore.loadPairedHost() {
|
||||||
LabeledContent("Transports", value: Self.transportsLabel(host))
|
LabeledContent("Transports", value: Self.transportsLabel(host))
|
||||||
@@ -209,6 +209,15 @@ struct SettingsView: View {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The live-connection status shown in the Connection section. Matches the generic
|
||||||
|
/// `Connectivity.label` except that a direct (hole-punched) path is named "Direct (STUN)"
|
||||||
|
/// here to surface *how* the peer-to-peer link was established — `.direct` is produced only
|
||||||
|
/// by the STUN-based upgrade. The chip and other surfaces keep the shorter "Direct".
|
||||||
|
private static func statusLabel(_ connectivity: RemoteStore.Connectivity) -> String {
|
||||||
|
if case .connected(.direct) = connectivity { return "Connected · Direct (STUN)" }
|
||||||
|
return connectivity.label
|
||||||
|
}
|
||||||
|
|
||||||
/// Every path this pairing can dial: LAN always, plus what the host advertised — a
|
/// Every path this pairing can dial: LAN always, plus what the host advertised — a
|
||||||
/// tailnet hint from the QR and/or a relay membership (QR or the host's later push).
|
/// tailnet hint from the QR and/or a relay membership (QR or the host's later push).
|
||||||
private static func transportsLabel(_ host: PairedHost) -> String {
|
private static func transportsLabel(_ host: PairedHost) -> String {
|
||||||
|
|||||||
Reference in New Issue
Block a user