Skip to content

Commit 1f0282a

Browse files
committed
chore: Remove overwrite feature
1 parent a1f2d07 commit 1f0282a

File tree

4 files changed

+8
-42
lines changed

4 files changed

+8
-42
lines changed

Diff for: samples/Uno.Toolkit.Samples/Uno.Toolkit.Samples.Shared/Content/Helpers/MediaGalleryHelperSamplePage.xaml.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public class MediaGalleryHelperSampleVM : ViewModelBase
7676
{
7777
var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/UnoLogo.png", UriKind.Absolute));
7878
using var stream = await file.OpenStreamForReadAsync();
79-
await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png", false);
79+
await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png");
8080
}
8181
else
8282
{
@@ -97,7 +97,7 @@ public class MediaGalleryHelperSampleVM : ViewModelBase
9797
using var stream = await file.OpenStreamForReadAsync();
9898

9999
var fileName = Guid.NewGuid() + ".png";
100-
await MediaGallery.SaveAsync(MediaFileType.Image, stream, fileName, false);
100+
await MediaGallery.SaveAsync(MediaFileType.Image, stream, fileName);
101101
}
102102
else
103103
{
@@ -116,7 +116,7 @@ public class MediaGalleryHelperSampleVM : ViewModelBase
116116
{
117117
var file = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appx:///Assets/UnoLogo.png", UriKind.Absolute));
118118
using var stream = await file.OpenStreamForReadAsync();
119-
await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png", true);
119+
await MediaGallery.SaveAsync(MediaFileType.Image, stream, "UnoLogo.png");
120120
}
121121
else
122122
{

Diff for: src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallery.Android.cs

+1-20
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ private static async Task<bool> CheckAccessPlatformAsync()
3434
}
3535
}
3636

37-
private static async Task<MediaGallerySaveResult> SavePlatformAsync(MediaFileType type, Stream sourceStream, string targetFileName, bool overwrite)
37+
private static async Task SavePlatformAsync(MediaFileType type, Stream sourceStream, string targetFileName)
3838
{
3939
var context = Application.Context;
4040
var contentResolver = context.ContentResolver ?? throw new InvalidOperationException("ContentResolver is not set.");
@@ -78,23 +78,6 @@ private static async Task<MediaGallerySaveResult> SavePlatformAsync(MediaFileTyp
7878
throw new InvalidOperationException($"Relative path for {type} is not available.");
7979
}
8080

81-
// Check if file already exists
82-
if (!overwrite)
83-
{
84-
using var cursor = contentResolver.Query(externalContentUri, null, $"{IMediaColumns.DisplayName} = ?", new[] { targetFileName }, null);
85-
86-
if (cursor is null)
87-
{
88-
throw new InvalidOperationException("Could not query media content");
89-
}
90-
91-
if (cursor.MoveToFirst())
92-
{
93-
cursor.Close();
94-
return MediaGallerySaveResult.Exists;
95-
}
96-
}
97-
9881
if ((int)Build.VERSION.SdkInt >= 29)
9982
{
10083
values.Put(IMediaColumns.RelativePath, Path.Combine(relativePath, appFolderName));
@@ -142,8 +125,6 @@ private static async Task<MediaGallerySaveResult> SavePlatformAsync(MediaFileTyp
142125
context.SendBroadcast(mediaScanIntent);
143126
#pragma warning restore CS0618 // Type or member is obsolete
144127
}
145-
146-
return MediaGallerySaveResult.Success;
147128
}
148129

149130
private static long TimeMillis(DateTime current) => (long)GetTimeDifference(current).TotalMilliseconds;

Diff for: src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallery.cs

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ public static partial class MediaGallery
2727
/// <param name="data">Byte array representing the file.</param>
2828
/// <param name="targetFileName">Target file name.</param>
2929
/// <returns>Task representing the progress of the operation.</returns>
30-
public static async Task<MediaGallerySaveResult> SaveAsync(MediaFileType type, byte[] data, string targetFileName, bool overwrite)
30+
public static async Task SaveAsync(MediaFileType type, byte[] data, string targetFileName)
3131
{
3232
using var memoryStream = new MemoryStream(data);
33-
return await SaveAsync(type, memoryStream, targetFileName, overwrite);
33+
await SaveAsync(type, memoryStream, targetFileName);
3434
}
3535

3636
/// <summary>
@@ -40,7 +40,7 @@ public static async Task<MediaGallerySaveResult> SaveAsync(MediaFileType type, b
4040
/// <param name="stream">Stream representing the file.</param>
4141
/// <param name="targetFileName">Target file name.</param>
4242
/// <returns>Task representing the progress of the operation.</returns>
43-
public static async Task<MediaGallerySaveResult> SaveAsync(MediaFileType type, Stream stream, string targetFileName, bool overwrite) =>
44-
await SavePlatformAsync(type, stream, targetFileName, overwrite);
43+
public static async Task SaveAsync(MediaFileType type, Stream stream, string targetFileName) =>
44+
await SavePlatformAsync(type, stream, targetFileName);
4545
}
4646
#endif

Diff for: src/Uno.Toolkit.UI/Helpers/MediaGallery/MediaGallerySaveResult.cs

-15
This file was deleted.

0 commit comments

Comments
 (0)