chore: Remove overwrite feature

unoplatform · May 29, 2024 · 1f0282a · 1f0282a
1 parent a1f2d07
commit 1f0282a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 42 deletions.
diff --git a/...t.Samples/Uno.Toolkit.Samples.Shared/Content/Helpers/MediaGalleryHelperSamplePage.xaml.cs b/...t.Samples/Uno.Toolkit.Samples.Shared/Content/Helpers/MediaGalleryHelperSamplePage.xaml.cs
@@ -76,7 +76,7 @@ public class MediaGalleryHelperSampleVM : ViewModelBase
 		{
 			var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/UnoLogo.png", UriKind.Absolute));
 			using var stream = await file.OpenStreamForReadAsync();
-			await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png", false);
+			await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png");
 		}
 		else
 		{
@@ -97,7 +97,7 @@ public class MediaGalleryHelperSampleVM : ViewModelBase
 			using var stream = await file.OpenStreamForReadAsync();
 
 			var fileName = Guid.NewGuid() + ".png";
-			await MediaGallery.SaveAsync(MediaFileType.Image, stream, fileName, false);
+			await MediaGallery.SaveAsync(MediaFileType.Image, stream, fileName);
 		}
 		else
 		{
@@ -116,7 +116,7 @@ public class MediaGalleryHelperSampleVM : ViewModelBase
 		{
 			var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/UnoLogo.png", UriKind.Absolute));
 			using var stream = await file.OpenStreamForReadAsync();
-			await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png", true);
+			await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png");
 		}
 		else
 		{

diff --git a/src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallery.Android.cs b/src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallery.Android.cs
@@ -34,7 +34,7 @@ private static async Task<bool> CheckAccessPlatformAsync()
 		}
 	}
 
-	private static async Task<MediaGallerySaveResult> SavePlatformAsync(MediaFileType type, Stream sourceStream, string targetFileName, bool overwrite)
+	private static async Task SavePlatformAsync(MediaFileType type, Stream sourceStream, string targetFileName)
 	{
 		var context = Application.Context;
 		var contentResolver = context.ContentResolver ?? throw new InvalidOperationException("ContentResolver is not set.");
@@ -78,23 +78,6 @@ private static async Task<MediaGallerySaveResult> SavePlatformAsync(MediaFileTyp
 			throw new InvalidOperationException($"Relative path for {type} is not available.");
 		}
 
-		// Check if file already exists
-		if (!overwrite)
-		{
-			using var cursor = contentResolver.Query(externalContentUri, null, $"{IMediaColumns.DisplayName} = ?", new[] { targetFileName }, null);
-
-			if (cursor is null)
-			{
-				throw new InvalidOperationException("Could not query media content");
-			}
-
-			if (cursor.MoveToFirst())
-			{
-				cursor.Close();
-				return MediaGallerySaveResult.Exists;
-			}
-		}
-
 		if ((int)Build.VERSION.SdkInt >= 29)
 		{
 			values.Put(IMediaColumns.RelativePath, Path.Combine(relativePath, appFolderName));
@@ -142,8 +125,6 @@ private static async Task<MediaGallerySaveResult> SavePlatformAsync(MediaFileTyp
 			context.SendBroadcast(mediaScanIntent);
 #pragma warning restore CS0618 // Type or member is obsolete
 		}
-
-		return MediaGallerySaveResult.Success;
 	}
 
 	private static long TimeMillis(DateTime current) => (long)GetTimeDifference(current).TotalMilliseconds;

diff --git a/src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallery.cs b/src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallery.cs
@@ -27,10 +27,10 @@ public static partial class MediaGallery
 	/// <param name="data">Byte array representing the file.</param>
 	/// <param name="targetFileName">Target file name.</param>
 	/// <returns>Task representing the progress of the operation.</returns>
-	public static async Task<MediaGallerySaveResult> SaveAsync(MediaFileType type, byte[] data, string targetFileName, bool overwrite)
+	public static async Task SaveAsync(MediaFileType type, byte[] data, string targetFileName)
 	{
 		using var memoryStream = new MemoryStream(data);
-		return await SaveAsync(type, memoryStream, targetFileName, overwrite);
+		await SaveAsync(type, memoryStream, targetFileName);
 	}
 
 	/// <summary>
@@ -40,7 +40,7 @@ public static async Task<MediaGallerySaveResult> SaveAsync(MediaFileType type, b
 	/// <param name="stream">Stream representing the file.</param>
 	/// <param name="targetFileName">Target file name.</param>
 	/// <returns>Task representing the progress of the operation.</returns>
-	public static async Task<MediaGallerySaveResult> SaveAsync(MediaFileType type, Stream stream, string targetFileName, bool overwrite) =>
-		await SavePlatformAsync(type, stream, targetFileName, overwrite);
+	public static async Task SaveAsync(MediaFileType type, Stream stream, string targetFileName) =>
+		await SavePlatformAsync(type, stream, targetFileName);
 }
 #endif
diff --git a/src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallerySaveResult.cs b/src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallerySaveResult.cs