Skip to content

Commit 4805088

Browse files
authored
Code Quality: Fixed Null Ref warnings in DetailsLayout (#14040)
1 parent 6f0bad2 commit 4805088

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

src/Files.App/Actions/FileSystem/OpenItemAction.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,9 @@ public OpenItemWithApplicationPickerAction()
8080

8181
public Task ExecuteAsync()
8282
{
83+
if (context.ShellPage is null)
84+
return Task.CompletedTask;
85+
8386
return NavigationHelpers.OpenSelectedItemsAsync(context.ShellPage, true);
8487
}
8588

src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,10 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
161161

162162
FilesystemViewModel_PageTypeUpdated(null, new PageTypeUpdatedEventArgs()
163163
{
164-
IsTypeCloudDrive = InstanceViewModel.IsPageTypeCloudDrive,
165-
IsTypeRecycleBin = InstanceViewModel.IsPageTypeRecycleBin,
166-
IsTypeGitRepository = InstanceViewModel.IsGitRepository,
167-
IsTypeSearchResults = InstanceViewModel.IsPageTypeSearchResults
164+
IsTypeCloudDrive = InstanceViewModel?.IsPageTypeCloudDrive ?? false,
165+
IsTypeRecycleBin = InstanceViewModel?.IsPageTypeRecycleBin ?? false,
166+
IsTypeGitRepository = InstanceViewModel?.IsGitRepository ?? false,
167+
IsTypeSearchResults = InstanceViewModel?.IsPageTypeSearchResults ?? false
168168
});
169169

170170
RootGrid_SizeChanged(null, null);
@@ -359,15 +359,17 @@ protected override async void FileList_PreviewKeyDown(object sender, KeyRoutedEv
359359
if (ctrlPressed && !shiftPressed)
360360
{
361361
var folders = ParentShellPageInstance?.SlimContentPage.SelectedItems?.Where(file => file.PrimaryItemAttribute == StorageItemTypes.Folder);
362-
foreach (ListedItem? folder in folders)
362+
if (folders is not null)
363363
{
364-
if (folder is not null)
364+
foreach (ListedItem folder in folders)
365365
await NavigationHelpers.OpenPathInNewTab(folder.ItemPath);
366366
}
367367
}
368368
else if (ctrlPressed && shiftPressed)
369369
{
370-
NavigationHelpers.OpenInSecondaryPane(ParentShellPageInstance, SelectedItems.FirstOrDefault(item => item.PrimaryItemAttribute == StorageItemTypes.Folder));
370+
var selectedFolder = SelectedItems?.FirstOrDefault(item => item.PrimaryItemAttribute == StorageItemTypes.Folder);
371+
if (selectedFolder is not null)
372+
NavigationHelpers.OpenInSecondaryPane(ParentShellPageInstance, selectedFolder);
371373
}
372374
}
373375
else if (e.Key == VirtualKey.Enter && e.KeyStatus.IsMenuKeyDown)
@@ -456,9 +458,9 @@ private async void FileList_ItemTapped(object sender, TappedRoutedEventArgs e)
456458
var item = clickedItem?.DataContext as ListedItem;
457459
if (item is null)
458460
{
459-
if (IsRenamingItem)
461+
if (IsRenamingItem && RenamingItem is not null)
460462
{
461-
ListViewItem listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
463+
ListViewItem? listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
462464
if (listViewItem is not null)
463465
{
464466
var textBox = listViewItem.FindDescendant("ItemNameTextBox") as TextBox;
@@ -491,11 +493,11 @@ clickedItem is Microsoft.UI.Xaml.Shapes.Rectangle
491493
{
492494
if (clickedItem is TextBlock && ((TextBlock)clickedItem).Name == "ItemName")
493495
{
494-
CheckRenameDoubleClick(clickedItem?.DataContext);
496+
CheckRenameDoubleClick(clickedItem.DataContext);
495497
}
496-
else if (IsRenamingItem)
498+
else if (IsRenamingItem && RenamingItem is not null)
497499
{
498-
ListViewItem listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
500+
ListViewItem? listViewItem = FileList.ContainerFromItem(RenamingItem) as ListViewItem;
499501
if (listViewItem is not null)
500502
{
501503
var textBox = listViewItem.FindDescendant("ItemNameTextBox") as TextBox;

0 commit comments

Comments
 (0)