Fix: Fixed issue where renaming in the conflict dialog would leave the copy status in process (#15305)

hishitetsu · web-flow · commit f316a624bed7 · 2024-05-05T08:12:11.000-07:00
diff --git a/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs b/src/Files.App/Utils/Storage/Operations/FilesystemHelpers.cs
@@ -317,8 +317,6 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
 
 			banner.Progress.ReportStatus(FileSystemStatusCode.Success);
 
-			await Task.Yield();
-
 			if (registerHistory && history is not null && source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))
 			{
 				foreach (var item in history.Source.Zip(history.Destination, (k, v) => new { Key = k, Value = v }).ToDictionary(k => k.Key, v => v.Value))
@@ -335,6 +333,8 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>
 				App.HistoryWrapper.AddHistory(history);
 			}
 
+			await Task.Yield();
+
 			var itemsCount = banner.TotalItemsCount;
 
 			_statusCenterViewModel.RemoveItem(banner);

Original file line number	Diff line number	Diff line change
`@@ -317,8 +317,6 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>`
`317`	`317`
`318`	`318`	`banner.Progress.ReportStatus(FileSystemStatusCode.Success);`
`319`	`319`
`320`		`- await Task.Yield();`
`321`		`-`
`322`	`320`	`if (registerHistory && history is not null && source.Any((item) => !string.IsNullOrWhiteSpace(item.Path)))`
`323`	`321`	`{`
`324`	`322`	`foreach (var item in history.Source.Zip(history.Destination, (k, v) => new { Key = k, Value = v }).ToDictionary(k => k.Key, v => v.Value))`
`@@ -335,6 +333,8 @@ public async Task<ReturnResult> CopyItemsAsync(IEnumerable<IStorageItemWithPath>`
`335`	`333`	`App.HistoryWrapper.AddHistory(history);`
`336`	`334`	`}`
`337`	`335`
	`336`	`+ await Task.Yield();`
	`337`	`+`
`338`	`338`	`var itemsCount = banner.TotalItemsCount;`
`339`	`339`
`340`	`340`	`_statusCenterViewModel.RemoveItem(banner);`