Skip to content

Commit 0c9f47e

Browse files
Fix: Fixed issue where original date and path was missing from Recycle Bin (#10612)
1 parent 417ea3a commit 0c9f47e

File tree

2 files changed

+8
-18
lines changed

2 files changed

+8
-18
lines changed

src/Files.App/Filesystem/StorageItems/ShellStorageFile.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,12 @@ public ShellStorageFile(ShellFileItem item)
7070
public static ShellStorageFile FromShellItem(ShellFileItem item)
7171
{
7272
if (item is ShellLinkItem linkItem)
73-
{
7473
return new ShortcutStorageFile(linkItem);
75-
}
76-
else if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.Ordinal))
77-
{
74+
75+
if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase))
7876
return new BinStorageFile(item);
79-
}
80-
else
81-
{
82-
return new ShellStorageFile(item);
83-
}
77+
78+
return new ShellStorageFile(item);
8479
}
8580

8681
public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)

src/Files.App/Filesystem/StorageItems/ShellStorageFolder.cs

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,12 @@ public static bool IsShellPath(string path)
8585
public static ShellStorageFolder FromShellItem(ShellFileItem item)
8686
{
8787
if (item is ShellLinkItem linkItem)
88-
{
8988
return new ShortcutStorageFolder(linkItem);
90-
}
91-
else if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.Ordinal))
92-
{
89+
90+
if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase))
9391
return new BinStorageFolder(item);
94-
}
95-
else
96-
{
97-
return new ShellStorageFolder(item);
98-
}
92+
93+
return new ShellStorageFolder(item);
9994
}
10095

10196
public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)

0 commit comments

Comments
 (0)