Skip to content

fix: Fix the issue of inconsistency between selected files and returned files. #2424

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

Closed
wants to merge 7 commits into from
Closed

fix: Fix the issue of inconsistency between selected files and returned files. #2424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9247396
fix: Fix the issue of Android saving files with a .txt extension
nashaofu Oct 6, 2024
c624c1a
fix(dialog): pull intent type from extensions filters
lucasfernog Oct 9, 2024
5b37a2f
fix covector
lucasfernog Oct 9, 2024
e071c26
Merge branch 'tauri-apps:v2' into v2
nashaofu Feb 15, 2025
fc7e6fc
fix: Fix the issue of inconsistency between selected files and return…
nashaofu Feb 15, 2025
d8efbb9
Merge branch 'tauri-apps:v2' into v2
nashaofu Feb 15, 2025
b900bab
Merge branch 'v2' into v2
nashaofu Feb 21, 2025
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
6 changes: 6 additions & 0 deletions .changes/fix-android-mime-type.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"dialog": patch
"dialog-js": patch
---

Set `save` dialog mime type from the `filters` extensions on Android.
6 changes: 2 additions & 4 deletions plugins/dialog/ios/Sources/FilePickerController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ public class FilePickerController: NSObject {
extension FilePickerController: UIDocumentPickerDelegate {
public func documentPicker(_ controller: UIDocumentPickerViewController, didPickDocumentsAt urls: [URL]) {
do {
let temporaryUrls = try urls.map { try saveTemporaryFile($0) }
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file path returned by saveTemporaryFile is inconsistent with $0, so the correct file cannot be obtained in the end.

self.plugin.onFilePickerEvent(.selected(temporaryUrls))
self.plugin.onFilePickerEvent(.selected(urls))
} catch {
self.plugin.onFilePickerEvent(.error("Failed to create a temporary copy of the file"))
}
Expand Down Expand Up @@ -149,8 +148,7 @@ extension FilePickerController: UIImagePickerControllerDelegate, UINavigationCon
dismissViewController(picker) {
if let url = info[.mediaURL] as? URL {
do {
let temporaryUrl = try self.saveTemporaryFile(url)
self.plugin.onFilePickerEvent(.selected([temporaryUrl]))
self.plugin.onFilePickerEvent(.selected([url]))
} catch {
self.plugin.onFilePickerEvent(.error("Failed to create a temporary copy of the file"))
}
Expand Down