Skip to content

Fix: Fixed issue where delete modal displayed duplicate items #10323

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
merged 6 commits into from
Oct 31, 2022
Merged

Fix: Fixed issue where delete modal displayed duplicate items #10323

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fab6d35
Fix delete warning
cinqmilleans Oct 29, 2022
561feb0
Merge remote-tracking branch 'upstream/main' into FixDeleteWarning
cinqmilleans Oct 30, 2022
a449725
Merge branch 'main' into FixDeleteWarning
yaira2 Oct 30, 2022
aa9a8be
Update src/Files.App/Filesystem/FilesystemOperations/ShellFilesystemO…
yaira2 Oct 31, 2022
146f65b
Merge branch 'main' into FixDeleteWarning
yaira2 Oct 31, 2022
327fbf3
Merge branch 'main' into FixDeleteWarning
yaira2 Oct 31, 2022
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
13 changes: 5 additions & 8 deletions src/Files.App/Filesystem/FilesystemOperations/ShellFilesystemOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Files.App.Helpers;
using Files.App.Shell;
using Files.Backend.Services;
using Files.Backend.ViewModels.Dialogs;
using Files.Backend.ViewModels.Dialogs.FileSystemDialog;
using Files.Shared;
using Files.Shared.Enums;
Expand All @@ -17,8 +16,6 @@
using System.Text.Json;
using System.Threading;
using System.Threading.Tasks;
using Windows.ApplicationModel.AppService;
using Windows.Foundation.Collections;
using Windows.Storage;

namespace Files.App.Filesystem
Expand Down Expand Up @@ -93,7 +90,7 @@ public async Task<IStorageHistory> CopyItemsAsync(IList<IStorageItemWithPath> so
if (sourceRename.Any())
{
var resultItem = await FileOperationsHelpers.CopyItemAsync(sourceRename.Select(s => s.Path).ToArray(), destinationRename.ToArray(), false, NativeWinApiHelper.CoreWindowHandle.ToInt64(), operationID, progress);

result &= (FilesystemResult)resultItem.Item1;

copyResult.Items.AddRange(resultItem.Item2?.Final ?? Enumerable.Empty<ShellOperationItemResult>());
Expand Down Expand Up @@ -330,11 +327,11 @@ public async Task<IStorageHistory> DeleteItemsAsync(IList<IStorageItemWithPath>
var operationID = Guid.NewGuid().ToString();
using var r = cancellationToken.Register(CancelOperation, operationID, false);

var (success, deleteResult) = await FileOperationsHelpers.DeleteItemAsync(deleleFilePaths.ToArray(), permanently, NativeWinApiHelper.CoreWindowHandle.ToInt64(), operationID, progress);
var (success, response) = await FileOperationsHelpers.DeleteItemAsync(deleleFilePaths.ToArray(), permanently, NativeWinApiHelper.CoreWindowHandle.ToInt64(), operationID, progress);

var result = (FilesystemResult)success;
var shellOpResult = deleteResult;
deleteResult.Items.AddRange(shellOpResult?.Final ?? Enumerable.Empty<ShellOperationItemResult>());
var deleteResult = new ShellOperationResult();
deleteResult.Items.AddRange(response?.Final ?? Enumerable.Empty<ShellOperationItemResult>());

result &= (FilesystemResult)deleteResult.Items.All(x => x.Succeeded);

Expand Down