Skip to content

Fix: Fixed issue where original date and path was missing from Recycle Bin #10612

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 2 commits into from
Dec 3, 2022
Merged

Fix: Fixed issue where original date and path was missing from Recycle Bin #10612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ae15535
ignore case for $Recycle.Bin
marcofranzen99 Dec 2, 2022
6654a61
cleanup if/else
marcofranzen99 Dec 2, 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: 4 additions & 9 deletions src/Files.App/Filesystem/StorageItems/ShellStorageFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,17 +70,12 @@ public ShellStorageFile(ShellFileItem item)
public static ShellStorageFile FromShellItem(ShellFileItem item)
{
if (item is ShellLinkItem linkItem)
{
return new ShortcutStorageFile(linkItem);
}
else if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.Ordinal))
{

if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase))
return new BinStorageFile(item);
}
else
{
return new ShellStorageFile(item);
}

return new ShellStorageFile(item);
}

public static IAsyncOperation<BaseStorageFile> FromPathAsync(string path)
Expand Down
13 changes: 4 additions & 9 deletions src/Files.App/Filesystem/StorageItems/ShellStorageFolder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,12 @@ public static bool IsShellPath(string path)
public static ShellStorageFolder FromShellItem(ShellFileItem item)
{
if (item is ShellLinkItem linkItem)
{
return new ShortcutStorageFolder(linkItem);
}
else if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.Ordinal))
{

if (item.RecyclePath.Contains("$Recycle.Bin", StringComparison.OrdinalIgnoreCase))
return new BinStorageFolder(item);
}
else
{
return new ShellStorageFolder(item);
}

return new ShellStorageFolder(item);
}

public static IAsyncOperation<BaseStorageFolder> FromPathAsync(string path)
Expand Down