-
Notifications
You must be signed in to change notification settings - Fork 468
Fix macios filepicker #2981
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.
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
matt-goldman
wants to merge
9
commits into
CommunityToolkit:main
Choose a base branch
from
matt-goldman:fix-macios-filepicker
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Fix macios filepicker #2981
Changes from 6 commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
4d9487c
Test file saver with export to service mode
matt-goldman ed5f254
Used correct constructor with asCopy set to true
matt-goldman 47ddfe5
Add temporary directory cleanup in file saving process
matt-goldman 07be3c6
Fixes disposal of temporary file on iOS
VladislavAntonyuk 7757fce
Merge branch 'main' into fix-macios-filepicker
TheCodeTraveler f87e43d
Fixes disposal of temporary directory on iOS
VladislavAntonyuk 08f9ffd
Update src/CommunityToolkit.Maui.Core/Essentials/FileSaver/FileSaverI…
matt-goldman 102300e
Merge branch 'main' into fix-macios-filepicker
matt-goldman d88f395
Merge branch 'main' into fix-macios-filepicker
matt-goldman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -29,30 +29,41 @@ async Task<string> InternalSaveAsync(string initialPath, string fileName, Stream | |||||||
| } | ||||||||
|
|
||||||||
| var fileUrl = tempDirectoryPath.Append(fileName, false); | ||||||||
| await WriteStream(stream, fileUrl.Path ?? throw new Exception("Path cannot be null."), progress, cancellationToken); | ||||||||
| try | ||||||||
| { | ||||||||
| await WriteStream(stream, fileUrl.Path ?? throw new Exception("Path cannot be null."), progress, cancellationToken); | ||||||||
|
|
||||||||
| cancellationToken.ThrowIfCancellationRequested(); | ||||||||
| taskCompetedSource?.TrySetCanceled(CancellationToken.None); | ||||||||
| var tcs = taskCompetedSource = new(cancellationToken); | ||||||||
| cancellationToken.ThrowIfCancellationRequested(); | ||||||||
| taskCompetedSource?.TrySetCanceled(CancellationToken.None); | ||||||||
| var tcs = taskCompetedSource = new(cancellationToken); | ||||||||
|
|
||||||||
| documentPickerViewController = new([fileUrl]) | ||||||||
| { | ||||||||
| DirectoryUrl = NSUrl.FromString(initialPath) | ||||||||
| }; | ||||||||
| documentPickerViewController.DidPickDocumentAtUrls += DocumentPickerViewControllerOnDidPickDocumentAtUrls; | ||||||||
| documentPickerViewController.WasCancelled += DocumentPickerViewControllerOnWasCancelled; | ||||||||
| documentPickerViewController = new([fileUrl], true) | ||||||||
| { | ||||||||
| DirectoryUrl = NSUrl.FromString(initialPath) | ||||||||
| }; | ||||||||
| documentPickerViewController.DidPickDocumentAtUrls += DocumentPickerViewControllerOnDidPickDocumentAtUrls; | ||||||||
| documentPickerViewController.WasCancelled += DocumentPickerViewControllerOnWasCancelled; | ||||||||
|
|
||||||||
| var currentViewController = Platform.GetCurrentUIViewController(); | ||||||||
| if (currentViewController is not null) | ||||||||
| { | ||||||||
| currentViewController.PresentViewController(documentPickerViewController, true, null); | ||||||||
| var currentViewController = Platform.GetCurrentUIViewController(); | ||||||||
| if (currentViewController is not null) | ||||||||
| { | ||||||||
| currentViewController.PresentViewController(documentPickerViewController, true, () => | ||||||||
| { | ||||||||
| fileManager.Remove(tempDirectoryPath, out _); | ||||||||
| }); | ||||||||
| } | ||||||||
| else | ||||||||
| { | ||||||||
| throw new FileSaveException("Unable to get a window where to present the file saver UI."); | ||||||||
| } | ||||||||
|
|
||||||||
| return await tcs.Task.WaitAsync(cancellationToken).ConfigureAwait(false); | ||||||||
| } | ||||||||
| else | ||||||||
| catch | ||||||||
| { | ||||||||
| throw new FileSaveException("Unable to get a window where to present the file saver UI."); | ||||||||
| fileManager.Remove(tempDirectoryPath, out _); | ||||||||
|
||||||||
| fileManager.Remove(tempDirectoryPath, out _); | |
| fileManager.Remove(tempDirectoryPath, out _); | |
| InternalDispose(); |
VladislavAntonyuk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
VladislavAntonyuk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
matt-goldman marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
matt-goldman marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The temporary directory cleanup in the completion callback may execute prematurely before the file picker operations complete. The completion callback of
PresentViewControlleris invoked immediately after the presentation animation finishes, not after the user completes their interaction with the document picker.This means the temp directory (and the file within it) could be deleted while the UIDocumentPickerViewController is still displaying and before the user has saved the file to their chosen location, which would cause the save operation to fail.
Consider removing the cleanup from the completion callback and instead perform the cleanup in the event handlers (
DocumentPickerViewControllerOnDidPickDocumentAtUrlsandDocumentPickerViewControllerOnWasCancelled) where the actual file picker interaction is complete.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@VladislavAntonyuk what are your thoughts on this? I had the cleanup method, which could be called in a
finallyor as part ofInternalDispose, that will always check for the file and remove it if it exists. If we restore that, it's always safe to call, and can be called from any catch or finally block, from dispose, or from the event handlers suggested here.