mirror of
https://github.com/sudosylabs/vnidrop.git
synced 2026-08-14 14:19:57 +02:00
Adds the native SwiftUI Saved Devices experience on top of the production saved-device core, as a top-level destination in the iOS tab bar and the macOS sidebar. Core seam: - App-facing saved-device domain models mirroring core/SavedDeviceModels.kt, with lifecycle helpers (canReceive/canResume/canCancel/canDelete) so views never hand-roll state checks. - 21 gateway methods through CoreGateway/CoreRepository with UniFFI mapping. cancelTargetedTransfer, forgetSavedDevice and blockDevice run off the serial lane: each must reach the core while a targeted receive is blocking it. - Payload-free pairingChanged/targetedTransferChanged signals, dispatched before the numeric-transferId guard since saved-device events identify their subject by peer endpoint or a string transfer id. Experience: - Screen lists saved devices and outstanding consent requests only; the global targeted-transfer history stays out, reachable per device. - Details as a sheet with detents on compact layouts and a native inspector on macOS, owning Send, label, forget/block and that device's transfers. - Label editing is transactional: the draft and editor survive a failed write, conflicting actions are refused while saving, and the editor closes only after the core confirms. - Pairing and targeted-offer consent hosted at the app root, answerable from any tab and suppressed while a transfer approval is up. Dismissing a pairing prompt suppresses locally without consuming the single-use eligibility; dismissing an offer declines it, since an unanswered offer holds a slot in the core's bounded per-sender queue. - Targeted send reuses the invitation composer's affordances with file, folder, rename, replace and cleanup parity. Picker copies are released on replace/remove/clear/cancel and after a successful create, but kept after a failure so retry does not require re-picking. - Notifications for pairing requests and offers (withdrawn once answered) and for terminal targeted transfers. Wording follows direction: on the sending device the peer finished receiving, not us. Localization: - Widens 52 saved-device keys from kmp-only to both platforms. - Five keys carried a literal %1$s with no declared args, which Compose renders positionally but the Apple generator emits as a plain constant, leaking the placeholder into the UI. They now use named args; Compose output is byte-identical. - Adds targeted_offer_title/body. Reusing the invitation approval copy stated the roles backwards, announcing the sender as the receiver. Also surfaces core startup failures: the startup overlay is drawn above the snackbar host, so a failed initialize() was indistinguishable from an app that never finished loading. AppModel now keeps the reason, logs it, and the overlay shows it with a retry, plus the technical detail in DEBUG builds. Send and receive between two devices is verified only partially; a missing endpoint-identity credential currently blocks startup on the test device.
120 lines
3.8 KiB
Swift
120 lines
3.8 KiB
Swift
#if os(iOS)
|
|
import Foundation
|
|
import UIKit
|
|
import VnidropCore
|
|
|
|
/// Native iOS file system service.
|
|
/// App-owned Documents is the fixed receive folder; custom folders are not
|
|
/// supported because raw external picker URLs do not survive relaunch.
|
|
struct IosFileSystemService: FileSystemService {
|
|
var supportsCustomReceiveFolders: Bool { false }
|
|
|
|
func defaultReceiveFolder() -> ReceiveFolder {
|
|
let path = FileManager.default
|
|
.urls(for: .documentDirectory, in: .userDomainMask)
|
|
.first?.path ?? ""
|
|
return ReceiveFolder(kind: .fileSystemPath, value: path, displayName: "Documents")
|
|
}
|
|
|
|
func validateReceiveFolder(_ folder: ReceiveFolder) async -> FolderAccessStatus {
|
|
switch folder.kind {
|
|
case .fileSystemPath:
|
|
return FileManager.default.isWritableFile(atPath: folder.value) ? .writable : .unavailable
|
|
case .iosSecurityScopedUrl:
|
|
return validateSecurityScopedUrl(folder.value)
|
|
}
|
|
}
|
|
|
|
func canRevealReceiveFolder(_ folder: ReceiveFolder) -> Bool {
|
|
folder.kind == .fileSystemPath
|
|
&& folder.value.trimmingTrailingSlash == defaultReceiveFolder().value.trimmingTrailingSlash
|
|
}
|
|
|
|
func revealReceiveFolder(_ folder: ReceiveFolder) async -> Result<Void, Error> {
|
|
guard canRevealReceiveFolder(folder) else {
|
|
return .failure(InvitationError.filesystemUnavailable)
|
|
}
|
|
guard let url = URL(string: "shareddocuments://\(folder.value)") else {
|
|
return .failure(InvitationError.filesystemUnavailable)
|
|
}
|
|
let opened = await withCheckedContinuation { continuation in
|
|
DispatchQueue.main.async {
|
|
UIApplication.shared.open(url, options: [:]) { success in
|
|
continuation.resume(returning: success)
|
|
}
|
|
}
|
|
}
|
|
return opened ? .success(()) : .failure(InvitationError.filesystemUnavailable)
|
|
}
|
|
|
|
func discardPickedFiles(_ files: [PickedShareFile]) async {
|
|
let paths = Set(files.filter { $0.isTemporaryCopy }.map { $0.value })
|
|
for path in paths {
|
|
try? FileManager.default.removeItem(atPath: path)
|
|
}
|
|
}
|
|
|
|
func sharePickedFiles(
|
|
repository: CoreGateway,
|
|
files: [PickedShareFile],
|
|
transferName: String,
|
|
senderName: String,
|
|
destination: ShareDestination
|
|
) async -> Result<Share, Error> {
|
|
guard !files.isEmpty else {
|
|
return .failure(InvitationError.shareEmpty)
|
|
}
|
|
let sources = files.map { $0.toIosShareSource() }
|
|
guard case .invitation(let accessPolicy) = destination else {
|
|
return .failure(InvitationError.unsupportedOperation)
|
|
}
|
|
return await repository.shareSources(
|
|
sources, transferName: transferName, senderName: senderName, accessPolicy: accessPolicy
|
|
)
|
|
}
|
|
|
|
func sendPickedFilesToSavedDevice(
|
|
repository: CoreGateway,
|
|
files: [PickedShareFile],
|
|
transferName: String,
|
|
receiverEndpointId: String
|
|
) async -> Result<TargetedTransferModel, Error> {
|
|
guard !files.isEmpty else {
|
|
return .failure(InvitationError.shareEmpty)
|
|
}
|
|
// iOS picks by copying into the container, so no security scope has to be
|
|
// re-acquired here (unlike macOS).
|
|
return await repository.createTargetedTransfer(
|
|
receiverEndpointId: receiverEndpointId,
|
|
sources: files.map { $0.toIosShareSource() },
|
|
transferName: transferName.isEmpty ? nil : transferName
|
|
)
|
|
}
|
|
|
|
private func validateSecurityScopedUrl(_ value: String) -> FolderAccessStatus {
|
|
let url = URL(string: value) ?? URL(fileURLWithPath: value)
|
|
let started = url.startAccessingSecurityScopedResource()
|
|
defer { if started { url.stopAccessingSecurityScopedResource() } }
|
|
if FileManager.default.isWritableFile(atPath: url.path) {
|
|
return .writable
|
|
}
|
|
return .permissionRequired
|
|
}
|
|
}
|
|
|
|
extension PickedShareFile {
|
|
/// iOS shares by filesystem path (from `asCopy` picker temp files).
|
|
func toIosShareSource() -> ShareSource {
|
|
ShareSource(kind: .path, value: value, displayName: displayName, isDirectory: isDirectory)
|
|
}
|
|
}
|
|
|
|
private extension String {
|
|
var trimmingTrailingSlash: String {
|
|
var s = self
|
|
while s.hasSuffix("/") { s.removeLast() }
|
|
return s
|
|
}
|
|
}
|
|
#endif
|