Skip to content

Feature: Show confirmation dialog when the undo operation is to delete items. #11185

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 10 commits into from
Feb 7, 2023
Merged

Feature: Show confirmation dialog when the undo operation is to delete items. #11185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5570052
WIP
hishitetsu Feb 6, 2023
b595131
Keep the history when canceled
hishitetsu Feb 7, 2023
a5f23f2
Merge branch 'main' into WarnUndo
hishitetsu Feb 7, 2023
86e62d6
Revert "Keep the history when canceled"
hishitetsu Feb 7, 2023
23c11c1
Update StorageHistoryHelpers.cs
hishitetsu Feb 7, 2023
f80867b
Update src/Files.App/Filesystem/StorageHistory/Helpers/StorageHistory…
hishitetsu Feb 7, 2023
e987e12
Merge branch 'main' into WarnUndo
hishitetsu Feb 7, 2023
79e2a41
Revert "WIP"
hishitetsu Feb 7, 2023
b95b064
Always show a dialog
hishitetsu Feb 7, 2023
31e54a2
Merge branch 'WarnUndo' of https://github.com/hishitetsu/Files into W…
hishitetsu Feb 7, 2023
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
9 changes: 7 additions & 2 deletions src/Files.App/Filesystem/StorageHistory/Helpers/StorageHistoryHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,18 @@ public async Task<ReturnResult> TryUndo()
{
return ReturnResult.InProgress;
}
bool keepHistory = false;
try
{
return await operations.Undo(App.HistoryWrapper.GetCurrentHistory());
ReturnResult result = await operations.Undo(App.HistoryWrapper.GetCurrentHistory());
keepHistory = result is ReturnResult.Cancelled;
return result;
}
finally
{
App.HistoryWrapper.DecreaseIndex();
if (!keepHistory)
App.HistoryWrapper.DecreaseIndex();

semaphore.Release();
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Files.App/Filesystem/StorageHistory/StorageHistoryOperations.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
case FileOperationType.CreateNew: // Opposite: Delete created items
if (!IsHistoryNull(history.Source))
{
return await helpers.DeleteItemsAsync(history.Source, false, true, false);
return await helpers.DeleteItemsAsync(history.Source, true, true, false); // Show a dialog to prevent unexpected deletion
}
break;
case FileOperationType.CreateLink: // Opposite: Delete created items
if (!IsHistoryNull(history.Destination))
{
return await helpers.DeleteItemsAsync(history.Destination, false, true, false);
return await helpers.DeleteItemsAsync(history.Destination, true, true, false); // Show a dialog to prevent unexpected deletion
}
break;
case FileOperationType.Rename: // Opposite: Restore original item names
Expand All @@ -61,7 +61,7 @@ public async Task<ReturnResult> Undo(IStorageHistory history)
case FileOperationType.Copy: // Opposite: Delete copied items
if (!IsHistoryNull(history.Destination))
{
return await helpers.DeleteItemsAsync(history.Destination, false, true, false);
return await helpers.DeleteItemsAsync(history.Destination, true, true, false); // Show a dialog to prevent unexpected deletion
}
break;
case FileOperationType.Move: // Opposite: Move the items to original directory
Expand Down