Skip to content

[iOS] Fix: invoke MediaPicker completion handler after DismissViewController #34250

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

Merged
jfversluis merged 3 commits into from
Feb 26, 2026
+7 −11
Merged

[iOS] Fix: invoke MediaPicker completion handler after DismissViewController #34250

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ad2baa9
Fix: invoke MediaPicker completion handler after DismissViewController
yuriikyry4enko Feb 25, 2026
b7326fa
fix(ios): remove redundant dismiss and fix indentation in PhotoPicker…
yuriikyry4enko Feb 26, 2026
2b3bc28
remove redundant async keyword in PhotoPickerDelegate CompletedHandler
yuriikyry4enko Feb 26, 2026
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
18 changes: 7 additions & 11 deletions src/Essentials/src/MediaPicker/MediaPicker.ios.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,9 @@ public async Task<FileResult> PhotoAsync(MediaPickerOptions options, bool photo,

picker.Delegate = new PhotoPickerDelegate
{
CompletedHandler = async info =>
CompletedHandler = info =>
{
GetFileResult(info, tcs, options);
await picker.DismissViewControllerAsync(true);
}
};
}
Expand Down Expand Up @@ -485,17 +484,14 @@ static async Task<FileResult> RotateImageFile(FileResult original)
class PhotoPickerDelegate : UIImagePickerControllerDelegate
{
public Action<NSDictionary> CompletedHandler { get; set; }

public override void FinishedPickingMedia(UIImagePickerController picker, NSDictionary info)
{
picker.DismissViewController(true, null);
CompletedHandler?.Invoke(info);
}
{
picker.DismissViewController(true, () => CompletedHandler?.Invoke(info));
}

public override void Canceled(UIImagePickerController picker)
{
picker.DismissViewController(true, null);
CompletedHandler?.Invoke(null);
picker.DismissViewController(true, () => CompletedHandler?.Invoke(null));
}
}
}
Expand All @@ -506,8 +502,8 @@ class PhotoPickerDelegate : PHPickerViewControllerDelegate

public override void DidFinishPicking(PHPickerViewController picker, PHPickerResult[] results)
{
picker.DismissViewController(true, null);
CompletedHandler?.Invoke(results?.Length > 0 ? results : []);
var captured = results?.Length > 0 ? results : [];
picker.DismissViewController(true, () => CompletedHandler?.Invoke(captured));
}
}

Expand Down