Also fixes real bugs found while making Phase 4 build clean on both platforms: - FileBookmarkService used .withSecurityScope unconditionally, but that bookmark option is macOS-only -- iOS grants scoped access automatically once the user picks a file. Now conditional per platform. - EntryEditViewModel's groupId was non-optional with no default, but EntryDetailView's edit-sheet call site (Task 14) has no group reference to pass -- only the "add new entry" path actually needs it, so groupId is now optional and validated at save time instead. - Missing `import Combine` in EntryDetailView (Timer.publish/autoconnect) and UnlockViewModel/VaultViewModel/EntryEditViewModel (@Published). - GroupBrowserView's `group: Group` property collided with SwiftUI's own Group view type -- qualified as MyPassCore.Group. - EntryEditView's .keyboardType(.URL) and .navigationBarTitleDisplayMode are iOS-only APIs, guarded with #if os(iOS) for the macOS build. Verified clean (aside from the known, expected ContentView.swift/Item breakage) on both iOS Simulator and macOS destinations. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01WYqycDFsynHH9VnnK7LNSf
79 lines
2.3 KiB
Swift
79 lines
2.3 KiB
Swift
//
|
|
// FileBookmarkService.swift
|
|
// MyPass
|
|
//
|
|
|
|
import Foundation
|
|
|
|
/// Persists a security-scoped bookmark for the user's KDBX file in the shared App Group.
|
|
public final class FileBookmarkService {
|
|
private static let key = "kdbxBookmark"
|
|
private let defaults: UserDefaults
|
|
|
|
public init(appGroup: String = "group.org.antiloop222.mypass") {
|
|
defaults = UserDefaults(suiteName: appGroup) ?? .standard
|
|
}
|
|
|
|
// `.withSecurityScope` is a macOS-only bookmark-creation option; iOS grants scoped
|
|
// access automatically once the user picks a file, without that flag.
|
|
private static var creationOptions: URL.BookmarkCreationOptions {
|
|
#if os(macOS)
|
|
return .withSecurityScope
|
|
#else
|
|
return []
|
|
#endif
|
|
}
|
|
|
|
private static var resolutionOptions: URL.BookmarkResolutionOptions {
|
|
#if os(macOS)
|
|
return .withSecurityScope
|
|
#else
|
|
return []
|
|
#endif
|
|
}
|
|
|
|
public func save(url: URL) throws {
|
|
let data = try url.bookmarkData(
|
|
options: Self.creationOptions,
|
|
includingResourceValuesForKeys: nil,
|
|
relativeTo: nil
|
|
)
|
|
defaults.set(data, forKey: Self.key)
|
|
}
|
|
|
|
/// Returns the resolved URL, starting security access. Caller must call `stopAccess(url:)` when done.
|
|
public func resolveURL() throws -> URL {
|
|
guard let data = defaults.data(forKey: Self.key) else { throw BookmarkError.notFound }
|
|
var isStale = false
|
|
let url = try URL(
|
|
resolvingBookmarkData: data,
|
|
options: Self.resolutionOptions,
|
|
relativeTo: nil,
|
|
bookmarkDataIsStale: &isStale
|
|
)
|
|
if isStale {
|
|
let fresh = try url.bookmarkData(options: Self.creationOptions, includingResourceValuesForKeys: nil, relativeTo: nil)
|
|
defaults.set(fresh, forKey: Self.key)
|
|
}
|
|
guard url.startAccessingSecurityScopedResource() else { throw BookmarkError.accessDenied }
|
|
return url
|
|
}
|
|
|
|
public func stopAccess(url: URL) {
|
|
url.stopAccessingSecurityScopedResource()
|
|
}
|
|
|
|
public func clear() {
|
|
defaults.removeObject(forKey: Self.key)
|
|
}
|
|
|
|
public var hasBookmark: Bool {
|
|
defaults.data(forKey: Self.key) != nil
|
|
}
|
|
}
|
|
|
|
public enum BookmarkError: Error {
|
|
case notFound
|
|
case accessDenied
|
|
}
|