Skip to content

Commit 4d83125

Browse files
committed
Requested changes
1 parent 5153804 commit 4d83125

5 files changed

Lines changed: 5 additions & 9 deletions

File tree

src/Files.App/Actions/Content/Archives/Decompress/BaseDecompressArchiveAction.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,13 @@ protected async Task DecompressArchiveHereAsync(bool smart = false)
6969

7070
if (await FilesystemTasks.Wrap(() => StorageArchiveService.IsEncryptedAsync(archive.Path)))
7171
{
72-
DecompressArchiveDialog decompressArchiveDialog = new();
7372
DecompressArchiveDialogViewModel decompressArchiveViewModel = new(archive)
7473
{
7574
IsArchiveEncrypted = true,
7675
ShowPathSelection = false
7776
};
7877

79-
decompressArchiveDialog.ViewModel = decompressArchiveViewModel;
78+
DecompressArchiveDialog decompressArchiveDialog = new() { ViewModel = decompressArchiveViewModel };
8079

8180
if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
8281
decompressArchiveDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;

src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,14 @@ public override async Task ExecuteAsync(object? parameter = null)
5757
var password = string.Empty;
5858
Encoding? encoding = null;
5959

60-
DecompressArchiveDialog decompressArchiveDialog = new();
6160
DecompressArchiveDialogViewModel decompressArchiveViewModel = new(archive)
6261
{
6362
IsArchiveEncrypted = isArchiveEncrypted,
6463
IsArchiveEncodingUndetermined = isArchiveEncodingUndetermined,
6564
ShowPathSelection = true,
6665
DetectedEncoding = detectedEncoding,
6766
};
68-
decompressArchiveDialog.ViewModel = decompressArchiveViewModel;
67+
DecompressArchiveDialog decompressArchiveDialog = new() { ViewModel = decompressArchiveViewModel };
6968

7069
if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
7170
decompressArchiveDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;

src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveToChildFolderAction.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,12 @@ public override async Task ExecuteAsync(object? parameter = null)
4343

4444
if (await FilesystemTasks.Wrap(() => StorageArchiveService.IsEncryptedAsync(archive.Path)))
4545
{
46-
DecompressArchiveDialog decompressArchiveDialog = new();
4746
DecompressArchiveDialogViewModel decompressArchiveViewModel = new(archive)
4847
{
4948
IsArchiveEncrypted = true,
5049
ShowPathSelection = false
5150
};
52-
decompressArchiveDialog.ViewModel = decompressArchiveViewModel;
51+
DecompressArchiveDialog decompressArchiveDialog = new() { ViewModel = decompressArchiveViewModel };
5352

5453
if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
5554
decompressArchiveDialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;

src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ private FrameworkElement RootAppElement
1616
get => (FrameworkElement)MainWindow.Instance.Content;
1717
}
1818

19-
public DecompressArchiveDialogViewModel ViewModel
19+
public required DecompressArchiveDialogViewModel ViewModel
2020
{
2121
get => (DecompressArchiveDialogViewModel)DataContext;
2222
set => DataContext = value;
@@ -29,7 +29,7 @@ public DecompressArchiveDialog()
2929

3030
private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialogButtonClickEventArgs args)
3131
{
32-
if (ViewModel is { IsArchiveEncrypted: true })
32+
if (ViewModel.IsArchiveEncrypted)
3333
ViewModel.PrimaryButtonClickCommand.Execute(new DisposableArray(Encoding.UTF8.GetBytes(Password.Password)));
3434
}
3535

src/Files.App/Services/App/AppDialogService.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ public DialogService()
2222
{ typeof(CredentialDialogViewModel), () => new CredentialDialog() },
2323
{ typeof(ElevateConfirmDialogViewModel), () => new ElevateConfirmDialog() },
2424
{ typeof(FileSystemDialogViewModel), () => new FilesystemOperationDialog() },
25-
{ typeof(DecompressArchiveDialogViewModel), () => new DecompressArchiveDialog() },
2625
{ typeof(CreateShortcutDialogViewModel), () => new CreateShortcutDialog() },
2726
{ typeof(ReorderSidebarItemsDialogViewModel), () => new ReorderSidebarItemsDialog() },
2827
{ typeof(AddBranchDialogViewModel), () => new AddBranchDialog() },

0 commit comments

Comments
 (0)