Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 32 additions & 3 deletions Sources/SceneCoordinator.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,9 @@ final class SceneCoordinator {
private var navigationController: UINavigationController?
private var retainedRootCoordinator: NavigationCoordinator?
private var userInterfaceStyleTask: Task<Void, Never>?
#if targetEnvironment(macCatalyst)
private var securityScopedURL: URL?
#endif

private let navigation: Navigation
private let defaultsService: DefaultsServiceProtocol
Expand Down Expand Up @@ -185,9 +188,16 @@ final class SceneCoordinator {

private func makeUserInfo(lastActiveURL: URL) -> [AnyHashable: Any] {
var userInfo: [AnyHashable: Any] = [Constants.urlKey: lastActiveURL.absoluteString]
if let fileURL = EditJotURL(url: lastActiveURL)?.fileURL,
let bookmark = try? fileURL.bookmarkData()
{
guard let fileURL = EditJotURL(url: lastActiveURL)?.fileURL else {
return userInfo
}
#if targetEnvironment(macCatalyst)
let bookmarkOptions = URL.BookmarkCreationOptions.withSecurityScope
#else
let bookmarkOptions = URL.BookmarkCreationOptions()
#endif

if let bookmark = try? fileURL.bookmarkData(options: bookmarkOptions) {
userInfo[Constants.fileBookmarkKey] = bookmark
}
return userInfo
Expand Down Expand Up @@ -232,16 +242,32 @@ final class SceneCoordinator {
}

var isStale = false

#if targetEnvironment(macCatalyst)
let bookmarkOptions = URL.BookmarkResolutionOptions.withSecurityScope
#else
let bookmarkOptions = URL.BookmarkResolutionOptions()
#endif

guard
let resolved = try? URL(
resolvingBookmarkData: bookmark,
options: bookmarkOptions,
bookmarkDataIsStale: &isStale
),
EditJotURL(url: url) != nil,
let rebuilt = makeEditJotURL(fileURL: resolved)
else {
return url
}

#if targetEnvironment(macCatalyst)
if resolved.startAccessingSecurityScopedResource() {
securityScopedURL?.stopAccessingSecurityScopedResource()
securityScopedURL = resolved
}
#endif

return rebuilt
}

Expand All @@ -263,6 +289,9 @@ final class SceneCoordinator {
}

deinit {
#if targetEnvironment(macCatalyst)
securityScopedURL?.stopAccessingSecurityScopedResource()
#endif
userInterfaceStyleTask?.cancel()
}
}
1 change: 0 additions & 1 deletion project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ targets:
path: Jottre.entitlements
properties:
com.apple.security.files.user-selected.read-write: true
com.apple.security.files.downloads.read-write: true
com.apple.developer.icloud-container-identifiers:
- iCloud.com.antonlorani.jottre
com.apple.developer.icloud-services:
Expand Down
Loading