mirror of
https://github.com/sudosylabs/vnidrop.git
synced 2026-08-14 14:19:57 +02:00
cdricms
6b6d5f158d
Creating a targeted transfer contacts the peer and only returns once the offer is answered or its timeouts expire — connection_timeout plus offer_wait_timeout, so minutes against a device that never answers. The composer disabled every control for that whole window, including Close, leaving no way out. Worse, the core records the row before it reaches out and leaves it in `failed` when the peer never replies, so giving up still produced a failure notification and a history entry for a send the user had already called off. Cancelling now reaches the core while that create is still running. The `created` lifecycle event carries the transfer id and is emitted before the peer is contacted, so the id is known in time; the cancel goes out through the interrupt lane, which exists precisely to reach a core busy inside another call. The transfer is then deleted, and its id is filtered out of the published list so a refresh racing the delete cannot leak it into history or into a notification. If the id has not arrived yet, the result carries it and the same cleanup runs on return. Picked sources are released only once the call lands, because the import owns them until then, and a generation counter keeps a late result from disturbing a newer send. Close and Cancel were also the same action under two labels. There is now one control: the sheet's cancellation item, reading Cancel while a send is waiting and Close otherwise, never disabled. Two further fixes from device testing: - Receive and Resume were gated on transfer state alone, so an approved outgoing transfer offered the sender a Receive button — an invitation to download the files it was uploading. Both pull into a local folder and are now receiver-only. - Renamed the deprecated `laptopcomputerAndIphone` symbol to `macbookAndIphone`; the deployment targets are well past where it was introduced, so no availability guard is needed. Adds a typed `targetedTransferId` accessor on CoreEventModel. This is a narrow, deliberate exception to the wake-up-only event rule in DESIGN-DEVICE-HISTORY.md §13: it takes the subject id and never state, and it exists because no query can answer while the create holds the serial lane — which is exactly when the user wants to cancel. Known gap: direction is inferred by comparing endpoint ids, because the binding does not expose the row's role. After an identity reset, rows predating it match neither endpoint, so past sends read as incoming from the device's own retired identity. Fixing that needs `role` on the core's TargetedTransfer.
76 lines
2.6 KiB
Swift
76 lines
2.6 KiB
Swift
import SwiftUI
|
|
import SFSafeSymbols
|
|
|
|
/// Shared presentation helpers for the saved-device surfaces.
|
|
|
|
extension SavedDeviceModel {
|
|
/// `localLabel`, else the peer's untrusted display-name hint, else a generic
|
|
/// placeholder. Never falls back to the endpoint ID, which stays diagnostic.
|
|
var displayName: String {
|
|
displayNameOrNil ?? String(localized: L10n.Saved.devicesUnnamed)
|
|
}
|
|
}
|
|
|
|
extension TargetedTransferStateModel {
|
|
var label: String {
|
|
switch self {
|
|
case .preparing: return String(localized: L10n.Status.preparing)
|
|
case .offering: return String(localized: L10n.Status.offering)
|
|
case .awaitingApproval: return String(localized: L10n.Status.awaitingApproval)
|
|
case .approved: return String(localized: L10n.Status.approved)
|
|
case .connecting: return String(localized: L10n.Status.connecting)
|
|
case .transferring: return String(localized: L10n.Status.transferring)
|
|
case .interrupted: return String(localized: L10n.Status.interrupted)
|
|
case .completed: return String(localized: L10n.Status.completed)
|
|
case .declined: return String(localized: L10n.Status.declined)
|
|
case .cancelled: return String(localized: L10n.Status.cancelled)
|
|
case .failed: return String(localized: L10n.Status.failed)
|
|
// Deleted transfers are filtered out of the snapshot; label it defensively
|
|
// rather than crashing if one ever reaches the UI.
|
|
case .deleted: return String(localized: L10n.Status.cancelled)
|
|
}
|
|
}
|
|
|
|
var tone: PillTone {
|
|
switch self {
|
|
case .completed: return .success
|
|
case .failed, .declined: return .destructive
|
|
case .interrupted: return .warning
|
|
case .transferring, .connecting, .approved: return .brand
|
|
default: return .neutral
|
|
}
|
|
}
|
|
}
|
|
|
|
/// A device identity avatar. Deliberately generic: the core exposes no trustworthy
|
|
/// hardware type, so showing a specific device silhouette would imply knowledge
|
|
/// VniDrop does not have.
|
|
struct DeviceAvatar: View {
|
|
var symbol: SFSymbol = .macbookAndIphone
|
|
var tint: Color = .secondary
|
|
var size: CGFloat = 40
|
|
|
|
var body: some View {
|
|
Image(systemSymbol: symbol)
|
|
.font(.system(size: size * 0.45))
|
|
.foregroundStyle(tint)
|
|
.frame(width: size, height: size)
|
|
.background(.quaternary, in: RoundedRectangle(cornerRadius: size * 0.225))
|
|
}
|
|
}
|
|
|
|
/// The endpoint ID, shown as secondary diagnostic detail. Truncated in the middle
|
|
/// so both ends stay recognizable, and never used as a device's name.
|
|
struct EndpointIdLabel: View {
|
|
let endpointId: String
|
|
|
|
var body: some View {
|
|
Text(L10n.Saved.devicesEndpoint(deviceId: endpointId))
|
|
.font(.caption2)
|
|
.foregroundStyle(.tertiary)
|
|
.lineLimit(1)
|
|
.truncationMode(.middle)
|
|
.textSelection(.enabled)
|
|
}
|
|
}
|