Skip to content

Fix: Fixed NullReferenceException with DefaultDestinationFolderPath #13662

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 5 commits into from
Nov 7, 2023
Merged

Fix: Fixed NullReferenceException with DefaultDestinationFolderPath #13662

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5b10a8
Fix: Fixed NullReferenceException with DefaultDestinationFolderPath
yaira2 Nov 5, 2023
23ba93c
Requested changes
yaira2 Nov 6, 2023
610dc69
Merge branch 'main' into ya/DefaultDestinationFolderPath-
yaira2 Nov 6, 2023
8a7bd64
Update src/Files.App/Utils/Archives/DecompressHelper.cs
yaira2 Nov 7, 2023
1efa729
Update src/Files.App/Utils/Archives/DecompressHelper.cs
yaira2 Nov 7, 2023
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/Files.App/Utils/Archives/DecompressHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,12 +172,18 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
if (associatedInstance == null)
return;

if (associatedInstance.SlimContentPage == null)
return;

foreach (var selectedItem in associatedInstance.SlimContentPage.SelectedItems)
{
var password = string.Empty;
BaseStorageFile archive = await StorageHelpers.ToStorageItem<BaseStorageFile>(selectedItem.ItemPath);
BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath);

if (archive is null)
return;

if (await FilesystemTasks.Wrap(() => IsArchiveEncrypted(archive)))
{
DecompressArchiveDialog decompressArchiveDialog = new();
Expand Down Expand Up @@ -205,6 +211,9 @@ public static async Task DecompressArchiveToChildFolderAsync(IShellPage associat
if (associatedInstance == null)
return;

if (associatedInstance.SlimContentPage == null)
return;

foreach (var selectedItem in associatedInstance.SlimContentPage.SelectedItems)
{
var password = string.Empty;
Expand All @@ -213,6 +222,9 @@ public static async Task DecompressArchiveToChildFolderAsync(IShellPage associat
BaseStorageFolder currentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(associatedInstance.FilesystemViewModel.CurrentFolder.ItemPath);
BaseStorageFolder destinationFolder = null;

if (archive is null)
return;

if (await FilesystemTasks.Wrap(() => DecompressHelper.IsArchiveEncrypted(archive)))
{
DecompressArchiveDialog decompressArchiveDialog = new();
Expand Down