Properly sort shortcut items in Recycle Bin (#3462)

gave92 · web-flow · commit 98997ce7c1e9 · 2021-02-06T20:17:09.000-05:00
diff --git a/Files.Launcher/Program.cs b/Files.Launcher/Program.cs
@@ -609,8 +609,18 @@ private static async Task ParseRecycleBinActionAsync(AppServiceRequestReceivedEv
                     {
                         try
                         {
-                            var shellFileItem = GetRecycleBinItem(folderItem);
-                            folderContentsList.Add(shellFileItem);
+                            // ShellLink Properties refer to destination and not shortcut
+                            if (folderItem is ShellLink shellLink)
+                            {
+                                using var tempItem = new ShellItem(shellLink.PIDL);
+                                var shellFileItem = GetRecycleBinItem(tempItem);
+                                folderContentsList.Add(shellFileItem);
+                            }
+                            else
+                            {
+                                var shellFileItem = GetRecycleBinItem(folderItem);
+                                folderContentsList.Add(shellFileItem);
+                            }
                         }
                         catch (FileNotFoundException)
                         {

Original file line number	Diff line number	Diff line change
`@@ -609,8 +609,18 @@ private static async Task ParseRecycleBinActionAsync(AppServiceRequestReceivedEv`
`609`	`609`	`{`
`610`	`610`	`try`
`611`	`611`	`{`
`612`		`- var shellFileItem = GetRecycleBinItem(folderItem);`
`613`		`- folderContentsList.Add(shellFileItem);`
	`612`	`+ // ShellLink Properties refer to destination and not shortcut`
	`613`	`+ if (folderItem is ShellLink shellLink)`
	`614`	`+ {`
	`615`	`+ using var tempItem = new ShellItem(shellLink.PIDL);`
	`616`	`+ var shellFileItem = GetRecycleBinItem(tempItem);`
	`617`	`+ folderContentsList.Add(shellFileItem);`
	`618`	`+ }`
	`619`	`+ else`
	`620`	`+ {`
	`621`	`+ var shellFileItem = GetRecycleBinItem(folderItem);`
	`622`	`+ folderContentsList.Add(shellFileItem);`
	`623`	`+ }`
`614`	`624`	`}`
`615`	`625`	`catch (FileNotFoundException)`
`616`	`626`	`{`