Fix: Fixed potential crash when opening properties for recent files (#…

…14535)
files-community · Jan 24, 2024 · ee80ce7 · ee80ce7
1 parent 46c0f2b
commit ee80ce7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 2 deletions.
diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -351,6 +351,12 @@
   <data name="FileNotFoundDialog.Text" xml:space="preserve">
     <value>The file you are attempting to access may have been moved or deleted.</value>
   </data>
+  <data name="CannotAccessPropertiesTitle" xml:space="preserve">
+    <value>Cannot open properties for this file</value>
+  </data>
+  <data name="CannotAccessPropertiesContent" xml:space="preserve">
+    <value>The file you are attempting to access may have been moved or deleted.</value>
+  </data>
   <data name="FileNotFoundDialog.Title" xml:space="preserve">
     <value>File Not Found</value>
   </data>

diff --git a/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs b/src/Files.App/UserControls/Widgets/RecentFilesWidget.xaml.cs
@@ -11,6 +11,7 @@
 using System.Collections.Specialized;
 using System.IO;
 using System.Runtime.CompilerServices;
+using Windows.Foundation.Metadata;
 using Windows.System;
 
 namespace Files.App.UserControls.Widgets
@@ -247,8 +248,27 @@ private void OpenProperties(RecentItem item)
 			flyoutClosed = async (s, e) =>
 			{
 				flyout!.Closed -= flyoutClosed;
-				var listedItem = await UniversalStorageEnumerator.AddFileAsync(await BaseStorageFile.GetFileFromPathAsync(item.Path), null, default);
-				FilePropertiesHelpers.OpenPropertiesWindow(listedItem, associatedInstance);
+
+				BaseStorageFile file = await FilesystemTasks.Wrap(() => StorageFileExtensions.DangerousGetFileFromPathAsync(item.Path));
+				if (file is null)
+				{
+					ContentDialog dialog = new()
+					{
+						Title = "CannotAccessPropertiesTitle".GetLocalizedResource(),
+						Content = "CannotAccessPropertiesContent".GetLocalizedResource(),
+						PrimaryButtonText = "Ok".GetLocalizedResource()
+					};
+
+					if (ApiInformation.IsApiContractPresent("Windows.Foundation.UniversalApiContract", 8))
+						dialog.XamlRoot = MainWindow.Instance.Content.XamlRoot;
+
+					await dialog.TryShowAsync();
+				}
+				else
+				{
+					var listedItem = await UniversalStorageEnumerator.AddFileAsync(file, null, default);
+					FilePropertiesHelpers.OpenPropertiesWindow(listedItem, associatedInstance);
+				}
 			};
 			flyout!.Closed += flyoutClosed;
 		}