Skip to content

Fix: add Cancel button to photo picker on macOS when Photos library is empty #509

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stakeswky wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: add Cancel button to photo picker on macOS when Photos library is empty #509

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 22 additions & 1 deletion KeePassium/util/photo-picker/GalleryPhotoPicker.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,29 @@ final class GalleryPhotoPicker: PhotoPicker {
}

override internal func _pickImageInternal() {
_presenter?.present(picker, animated: true, completion: nil)
_presenter?.present(picker, animated: true) { [weak self] in
#if targetEnvironment(macCatalyst)
// On macOS, PHPickerViewController shows no close button when the Photos library is
// empty, leaving the user with no way to dismiss it (issue #507).
// Inject a Cancel button into the navigation bar as a reliable escape hatch.
guard let self else { return }
let cancelButton = UIBarButtonItem(
barButtonSystemItem: .cancel,
target: self,
action: #selector(self.cancelPicker)
)
self.picker.navigationItem.leftBarButtonItem = cancelButton
#endif
}
}

#if targetEnvironment(macCatalyst)
@objc private func cancelPicker() {
_presenter?.dismiss(animated: true) { [weak self] in
self?._completion?(.success(nil))
}
}
#endif

override class func isAllowed() -> Bool {
#if INTUNE
Expand Down