Rework the "picker" results to correctly manage files

Samples/Samples.Android/Properties/AndroidManifest.xml

@@ -13,26 +13,35 @@
 	<uses-permission android:name="android.permission.VIBRATE" />
 	<uses-permission android:name="android.permission.READ_CONTACTS" />
 	<queries>
+		<!-- Email -->
 		<intent>
 			<action android:name="android.intent.action.SENDTO" />
 			<data android:scheme="mailto" />
 		</intent>
+		<!-- Browser -->
 		<intent>
 			<action android:name="android.intent.action.VIEW" />
 			<data android:scheme="http" />
 		</intent>
+		<!-- Browser -->
 		<intent>
 			<action android:name="android.intent.action.VIEW" />
 			<data android:scheme="https" />
 		</intent>
+		<!-- Sms -->
 		<intent>
 			<action android:name="android.intent.action.VIEW" />
 			<data android:scheme="smsto" />
 		</intent>
+		<!-- PhoneDialer -->
 		<intent>
 			<action android:name="android.intent.action.DIAL" />
 			<data android:scheme="tel" />
 		</intent>
+		<!-- MediaPicker -->
+		<intent>
+			<action android:name="android.media.action.IMAGE_CAPTURE" />
+		</intent>
 	</queries>
 	<uses-feature android:name="android.hardware.location" android:required="false" />
 	<uses-feature android:name="android.hardware.location.gps" android:required="false" />

Xamarin.Essentials/FilePicker/FilePicker.android.cs

@@ -2,11 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
-using Android.App;
 using Android.Content;
-using Android.Provider;
 
 namespace Xamarin.Essentials
 {
@@ -33,23 +30,30 @@ static async Task<IEnumerable<FileResult>> PlatformPickAsync(PickOptions options
 
             try
             {
-                var result = await IntermediateActivity.StartAsync(pickerIntent, Platform.requestCodeFilePicker);
                 var resultList = new List<FileResult>();
-
-                var clipData = new List<global::Android.Net.Uri>();
-
-                if (result.ClipData == null)
+                void OnResult(Intent intent)
                 {
-                    clipData.Add(result.Data);
-                }
-                else
-                {
-                    for (var i = 0; i < result.ClipData.ItemCount; i++)
-                        clipData.Add(result.ClipData.GetItemAt(i).Uri);
+                    // The uri returned is only temporary and only lives as long as the Activity that requested it,
+                    // so this means that it will always be cleaned up by the time we need it because we are using
+                    // an intermediate activity.
+
+                    if (intent.ClipData == null)
+                    {
+                        var path = FileSystem.EnsurePhysicalPath(intent.Data);
+                        resultList.Add(new FileResult(path));
+                    }
+                    else
+                    {
+                        for (var i = 0; i < intent.ClipData.ItemCount; i++)
+                        {
+                            var uri = intent.ClipData.GetItemAt(i).Uri;
+                            var path = FileSystem.EnsurePhysicalPath(uri);
+                            resultList.Add(new FileResult(path));
+                        }
+                    }
                 }
 
-                foreach (var contentUri in clipData)
-                    resultList.Add(new FileResult(contentUri));
+                await IntermediateActivity.StartAsync(pickerIntent, Platform.requestCodeFilePicker, onResult: OnResult);
 
                 return resultList;
             }