Faster photo picking on iOS

src/Uno.UI/Resources/Strings/cs-CZ/Resources.resw

@@ -126,6 +126,9 @@
   <data name="StorageProviderIosSecurityScopedDisplayName" xml:space="preserve">
     <value>iOS Security Scoped</value>
   </data>
+  <data name="StorageProviderIosPHPickerDisplayName" xml:space="preserve">
+    <value>iOS PHPicker</value>
+  </data>
   <data name="StorageProviderLocalDisplayName" xml:space="preserve">
     <value>Tento počítač</value>
   </data>
@@ -135,4 +138,4 @@
   <data name="StorageProviderWasmNativeDisplayName" xml:space="preserve">
     <value>JS File Access API</value>
   </data>
-</root>
+</root>

src/Uno.UI/Resources/Strings/en/Resources.resw

@@ -126,6 +126,9 @@
   <data name="StorageProviderIosSecurityScopedDisplayName" xml:space="preserve">
     <value>iOS Security Scoped</value>
   </data>
+  <data name="StorageProviderIosPHPickerDisplayName" xml:space="preserve">
+    <value>iOS PHPicker</value>
+  </data>
   <data name="StorageProviderLocalDisplayName" xml:space="preserve">
     <value>This PC</value>
   </data>

src/Uno.UWP/Devices/Sensors/Helpers/SensorHelpers.iOS.cs

@@ -1,52 +1,14 @@
 using Foundation;
 using System;
 
-namespace Uno.Devices.Sensors.Helpers
+namespace Uno.Devices.Sensors.Helpers;
+
+internal static class SensorHelpers
 {
-	internal static class SensorHelpers
+	public static DateTimeOffset TimestampToDateTimeOffset(double timestamp)
 	{
-		private static readonly DateTimeOffset NSDateConversionStart =
-			new DateTimeOffset(2001, 1, 1, 0, 0, 0, TimeSpan.Zero);
-
-		public static DateTimeOffset TimestampToDateTimeOffset(double timestamp)
-		{
-			var bootTime = NSDate.FromTimeIntervalSinceNow(-NSProcessInfo.ProcessInfo.SystemUptime);
-			var date = (DateTime)bootTime.AddSeconds(timestamp);
-			return new DateTimeOffset(date);
-		}
-
-		public static DateTimeOffset NSDateToDateTimeOffset(NSDate nsDate)
-		{
-			if (nsDate == NSDate.DistantPast)
-			{
-				return DateTimeOffset.MinValue;
-			}
-			else if (nsDate == NSDate.DistantFuture)
-			{
-				return DateTimeOffset.MaxValue;
-			}
-
-			return NSDateConversionStart.AddSeconds(
-				nsDate.SecondsSinceReferenceDate);
-		}
-
-		public static NSDate DateTimeOffsetToNSDate(DateTimeOffset dateTimeOffset)
-		{
-			if (dateTimeOffset == DateTimeOffset.MinValue)
-			{
-				return NSDate.DistantPast;
-			}
-			else if (dateTimeOffset == DateTimeOffset.MaxValue)
-			{
-				return NSDate.DistantFuture;
-			}
-
-			var dateInSecondsFromStart = dateTimeOffset
-				.ToUniversalTime()
-				.Subtract(NSDateConversionStart.UtcDateTime);
-
-			return NSDate.FromTimeIntervalSinceReferenceDate(
-				dateInSecondsFromStart.TotalSeconds);
-		}
+		var bootTime = NSDate.FromTimeIntervalSinceNow(-NSProcessInfo.ProcessInfo.SystemUptime);
+		var date = (DateTime)bootTime.AddSeconds(timestamp);
+		return new DateTimeOffset(date);
 	}
 }

src/Uno.UWP/Extensions/NSDateExtensions.cs

@@ -0,0 +1,48 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Foundation;
+
+namespace Windows.Extensions;
+
+internal static class NSDateExtensions
+{
+	private static readonly DateTimeOffset NSDateConversionStart =
+		new DateTimeOffset(2001, 1, 1, 0, 0, 0, TimeSpan.Zero);
+
+	public static DateTimeOffset ToDateTimeOffset(this NSDate nsDate)
+	{
+		if (nsDate == NSDate.DistantPast)
+		{
+			return DateTimeOffset.MinValue;
+		}
+		else if (nsDate == NSDate.DistantFuture)
+		{
+			return DateTimeOffset.MaxValue;
+		}
+
+		return NSDateConversionStart.AddSeconds(
+			nsDate.SecondsSinceReferenceDate);
+	}
+
+	public static NSDate ToNSDate(this DateTimeOffset dateTimeOffset)
+	{
+		if (dateTimeOffset == DateTimeOffset.MinValue)
+		{
+			return NSDate.DistantPast;
+		}
+		else if (dateTimeOffset == DateTimeOffset.MaxValue)
+		{
+			return NSDate.DistantFuture;
+		}
+
+		var dateInSecondsFromStart = dateTimeOffset
+			.ToUniversalTime()
+			.Subtract(NSDateConversionStart.UtcDateTime);
+
+		return NSDate.FromTimeIntervalSinceReferenceDate(
+			dateInSecondsFromStart.TotalSeconds);
+	}
+}

src/Uno.UWP/Storage/Internal/StorageProviders.cs

@@ -18,6 +18,8 @@ internal static class StorageProviders
 
 #if __IOS__
 		public static StorageProvider IosSecurityScoped { get; } = new StorageProvider("iossecurityscoped", "StorageProviderIosSecurityScopedDisplayName");
+
+		public static StorageProvider IosPHPicker { get; } = new("iosphpicker", "StorageProviderIosPHPickerDisplayName");
 #endif
 	}
 }

src/Uno.UWP/Storage/Pickers/FileOpenPicker.cs

@@ -100,21 +100,4 @@ private void ValidateConfiguration()
 		}
 #endif
 	}
-
-	public static class FileOpenPickerExtensions
-	{
-		/// <summary>
-		/// Sets the file limit a user can select when picking multiple files.
-		/// </summary>
-		/// <param name="limit">The maximum number of files that the user can pick.</param>
-#if !__IOS__
-		[global::Uno.NotImplemented]
-#endif
-		public static void SetMultipleFilesLimit(this FileOpenPicker picker, int limit)
-		{
-#if __IOS__
-			picker.SetMultipleFileLimit(limit);
-#endif
-		}
-	}
 }

src/Uno.UWP/Storage/Pickers/FileOpenPicker.iOS.cs

@@ -5,22 +5,22 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using Uno.Storage.Pickers.Internal;
-using UIKit;
 using Foundation;
-using Windows.ApplicationModel.Core;
-using Uno.Helpers.Theming;
+using MobileCoreServices;
+using Photos;
 using PhotosUI;
+using UIKit;
+using Uno.Helpers.Theming;
+using Uno.Storage.Pickers.Internal;
 using Uno.UI.Dispatching;
-using MobileCoreServices;
-using Windows.Foundation.Metadata;
-using Uno.Foundation.Logging;
+using Windows.ApplicationModel.Core;
 
 namespace Windows.Storage.Pickers
 {
 	public partial class FileOpenPicker
 	{
 		private int _multipleFileLimit;
+		private bool _isReadOnly;
 
 		private Task<StorageFile?> PickSingleFileTaskAsync(CancellationToken token)
 		{
@@ -53,10 +53,9 @@ private Task<IReadOnlyList<StorageFile>> PickMultipleFilesTaskAsync(Cancellation
 			return tcs.Task;
 		}
 
-		internal void SetMultipleFileLimit(int limit)
-		{
-			_multipleFileLimit = limit;
-		}
+		internal void SetMultipleFileLimit(int limit) => _multipleFileLimit = limit;
+
+		internal void SetReadOnlyMode(bool readOnly) => _isReadOnly = readOnly;
 
 		private UIViewController GetViewController(bool multiple, int limit, TaskCompletionSource<StorageFile?[]> completionSource)
 		{
@@ -73,24 +72,24 @@ private UIViewController GetViewController(bool multiple, int limit, TaskComplet
 					};
 
 				case PickerLocationId.PicturesLibrary when multiple is true && iOS14AndAbove is true:
-					var imageConfiguration = new PHPickerConfiguration
+					var imageConfiguration = new PHPickerConfiguration(PHPhotoLibrary.SharedPhotoLibrary)
 					{
 						Filter = PHPickerFilter.ImagesFilter,
 						SelectionLimit = limit
 					};
 					return new PHPickerViewController(imageConfiguration)
 					{
-						Delegate = new PhotoPickerDelegate(completionSource)
+						Delegate = new PhotoPickerDelegate(completionSource, _isReadOnly)
 					};
 				case PickerLocationId.VideosLibrary when multiple is true && iOS14AndAbove is true:
-					var videoConfiguration = new PHPickerConfiguration
+					var videoConfiguration = new PHPickerConfiguration(PHPhotoLibrary.SharedPhotoLibrary)
 					{
 						Filter = PHPickerFilter.VideosFilter,
 						SelectionLimit = limit
 					};
 					return new PHPickerViewController(videoConfiguration)
 					{
-						Delegate = new PhotoPickerDelegate(completionSource)
+						Delegate = new PhotoPickerDelegate(completionSource, _isReadOnly)
 					};
 
 				default:
@@ -167,9 +166,13 @@ public override void FinishedPickingMedia(UIImagePickerController picker, NSDict
 		private class PhotoPickerDelegate : PHPickerViewControllerDelegate
 		{
 			private readonly TaskCompletionSource<StorageFile?[]> _taskCompletionSource;
+			private readonly bool _readOnly;
 
-			public PhotoPickerDelegate(TaskCompletionSource<StorageFile?[]> taskCompletionSource) =>
+			public PhotoPickerDelegate(TaskCompletionSource<StorageFile?[]> taskCompletionSource, bool readOnly)
+			{
 				_taskCompletionSource = taskCompletionSource;
+				_readOnly = readOnly;
+			}
 
 			public override async void DidFinishPicking(PHPickerViewController picker, PHPickerResult[] results)
 			{
@@ -186,56 +189,50 @@ public override async void DidFinishPicking(PHPickerViewController picker, PHPic
 			private async Task<IEnumerable<StorageFile>> ConvertPickerResults(PHPickerResult[] results)
 			{
 				List<StorageFile> storageFiles = new List<StorageFile>();
-				var providers = results
-					.Select(res => res.ItemProvider)
-					.Where(provider => provider != null && provider.RegisteredTypeIdentifiers?.Length > 0)
-					.ToArray();
-
-				foreach (NSItemProvider provider in providers)
+				if (_readOnly)
 				{
-					var identifier = GetIdentifier(provider.RegisteredTypeIdentifiers ?? []) ?? "public.data";
-					var data = await provider.LoadDataRepresentationAsync(identifier);
-
-					if (data is null)
+					var assetIdentifiers = results
+						.Select(res => res.AssetIdentifier!)
+						.Where(id => id != null)
+						.ToArray();
+
+					var resultsByIdentifier = results.ToDictionary(res => res.AssetIdentifier!);
+					var assets = PHAsset.FetchAssetsUsingLocalIdentifiers(assetIdentifiers, null);
+					foreach (PHAsset asset in assets)
 					{
-						continue;
+						var file = StorageFile.GetFromPHPickerResult(resultsByIdentifier[asset.LocalIdentifier], asset, null);
+						storageFiles.Add(file);
 					}
-
-					var extension = GetExtension(identifier);
-
-					var destinationUrl = NSFileManager.DefaultManager
-						.GetTemporaryDirectory()
-						.Append($"{NSProcessInfo.ProcessInfo.GloballyUniqueString}.{extension}", false);
-					data.Save(destinationUrl, false);
-
-					storageFiles.Add(StorageFile.GetFromSecurityScopedUrl(destinationUrl, null));
 				}
-
-				return storageFiles;
-			}
-			private static string? GetIdentifier(string[] identifiers)
-			{
-				if (!(identifiers?.Length > 0))
+				else
 				{
-					return null;
-				}
+					var providers = results
+						.Select(res => res.ItemProvider)
+						.Where(provider => provider != null && provider.RegisteredTypeIdentifiers?.Length > 0)
+						.ToArray();
 
-				if (identifiers.Any(i => i.StartsWith(UTType.LivePhoto, StringComparison.InvariantCultureIgnoreCase)) && identifiers.Contains(UTType.JPEG))
-				{
-					return identifiers.FirstOrDefault(i => i == UTType.JPEG);
-				}
+					foreach (NSItemProvider provider in providers)
+					{
+						var identifier = StorageFile.GetUTIdentifier(provider.RegisteredTypeIdentifiers ?? []) ?? "public.data";
+						var data = await provider.LoadDataRepresentationAsync(identifier);
 
-				if (identifiers.Contains(UTType.QuickTimeMovie))
-				{
-					return identifiers.FirstOrDefault(i => i == UTType.QuickTimeMovie);
-				}
+						if (data is null)
+						{
+							continue;
+						}
 
-				return identifiers.FirstOrDefault();
-			}
+						var extension = StorageFile.GetUTFileExtension(identifier);
 
-			private string? GetExtension(string identifier)
-			=> UTType.CopyAllTags(identifier, UTType.TagClassFilenameExtension)?.FirstOrDefault();
+						var destinationUrl = NSFileManager.DefaultManager
+							.GetTemporaryDirectory()
+							.Append($"{NSProcessInfo.ProcessInfo.GloballyUniqueString}.{extension}", false);
+						data.Save(destinationUrl, false);
 
+						storageFiles.Add(StorageFile.GetFromSecurityScopedUrl(destinationUrl, null));
+					}
+				}
+				return storageFiles;
+			}
 		}
 
 		private class FileOpenPickerDelegate : UIDocumentPickerDelegate

src/Uno.UWP/Storage/Pickers/FileOpenPickerExtensions.cs

@@ -0,0 +1,38 @@
+#nullable enable
+
+namespace Windows.Storage.Pickers;
+
+/// <summary>
+/// Contains Uno Platform-specific extesions for the <see cref="FileOpenPicker"/> class.
+/// </summary>
+public static class FileOpenPickerExtensions
+{
+	/// <summary>
+	/// Sets the file limit a user can select when picking multiple files.
+	/// </summary>
+	/// <param name="limit">The maximum number of files that the user can pick.</param>
+#if !__IOS__
+	[global::Uno.NotImplemented]
+#endif
+	public static void SetMultipleFilesLimit(this FileOpenPicker picker, int limit)
+	{
+#if __IOS__
+		picker.SetMultipleFileLimit(limit);
+#endif
+	}
+
+	/// <summary>
+	/// 
+	/// </summary>
+	/// <param name="picker"></param>
+	/// <param name="readOnly"></param>
+#if !__IOS__
+	[global::Uno.NotImplemented]
+#endif
+	public static void SetReadOnlyMode(this FileOpenPicker picker, bool readOnly)
+	{
+#if __IOS__
+		picker.SetReadOnlyMode(readOnly);
+#endif
+	}
+}