Prevent Startup Crash from Null Object

Author: lukeblevins

Files UWP/App.xaml.cs

@@ -22,7 +22,6 @@ public App()
             this.InitializeComponent();
             this.Suspending += OnSuspending;
             this.UnhandledException += App_UnhandledException;
-
             Windows.Storage.ApplicationDataContainer localSettings = Windows.Storage.ApplicationData.Current.LocalSettings;
 
             if (localSettings.Values["theme"] != null)

Files UWP/ProHome.xaml.cs

@@ -96,15 +96,19 @@ public ProHome()
             }
 
             // Overwrite paths for common locations if Custom Locations setting is enabled
-            if (localSettings.Values["customLocationsSetting"].Equals(true))
+            if(localSettings.Values["customLocationsSetting"] != null)
             {
-                DesktopPath = localSettings.Values["DesktopLocation"].ToString();
-                DownloadsPath = localSettings.Values["DownloadsLocation"].ToString();
-                DocumentsPath = localSettings.Values["DocumentsLocation"].ToString();
-                PicturesPath = localSettings.Values["PicturesLocation"].ToString();
-                MusicPath = localSettings.Values["MusicLocation"].ToString();
-                VideosPath = localSettings.Values["VideosLocation"].ToString();
+                if (localSettings.Values["customLocationsSetting"].Equals(true))
+                {
+                    DesktopPath = localSettings.Values["DesktopLocation"].ToString();
+                    DownloadsPath = localSettings.Values["DownloadsLocation"].ToString();
+                    DocumentsPath = localSettings.Values["DocumentsLocation"].ToString();
+                    PicturesPath = localSettings.Values["PicturesLocation"].ToString();
+                    MusicPath = localSettings.Values["MusicLocation"].ToString();
+                    VideosPath = localSettings.Values["VideosLocation"].ToString();
+                }
             }
+            
 
         }
 
@@ -114,8 +118,17 @@ public ProHome()
 
         public async void PopulatePinnedSidebarItems()
         {
+            StorageFile ListFile;
             StorageFolder cacheFolder = Windows.Storage.ApplicationData.Current.LocalCacheFolder;
-            var ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
+            try
+            {
+                ListFile = await cacheFolder.GetFileAsync("PinnedItems.txt");
+            }
+            catch(FileNotFoundException)
+            {
+                ListFile = await cacheFolder.CreateFileAsync("PinnedItems.txt");
+            }
+            
             if(ListFile != null)
             {
                 var ListFileLines = await FileIO.ReadLinesAsync(ListFile);

Files UWP/SettingsPages/About.xaml

@@ -15,7 +15,7 @@
                 <TextBlock x:Name="Header" Text="Files UWP" Margin="0,0,0,5" FontFamily="Segoe UI Black" FontWeight="Bold" FontSize="40" HorizontalAlignment="Left" VerticalAlignment="Top" />
                 <TextBlock Margin="0,0,0,5" FontFamily="Segoe UI" FontSize="20" Text="Product Information"/>
                 <TextBlock FontSize="14" Text="Edition: Pre-Release"/>
-                <TextBlock FontSize="14" Text="Version: 0.5.0-newui_snapshot1"/>
+                <TextBlock FontSize="14" Text="Version: 0.5.0-newui_snapshot3-internal"/>
                 <ListView  IsItemClickEnabled="True" Margin="0,24,0,0" ItemClick="ListView_ItemClick" HorizontalAlignment="Left" Width="875">
                     <ListViewItem IsEnabled="True" Name="FeedbackForm" Height="65" HorizontalAlignment="Stretch">
                         <StackPanel  Orientation="Horizontal">

Files UWP/UnhandledExceptionDisplay.xaml.cs

@@ -15,13 +15,9 @@
 using Windows.UI.Xaml.Media;
 using Windows.UI.Xaml.Navigation;
 
-// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
 
 namespace Files
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
     public sealed partial class UnhandledExceptionDisplay : Page
     {
         public UnhandledExceptionDisplay()
@@ -35,7 +31,7 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
             base.OnNavigatedTo(eventArgs);
             var Parameter = eventArgs.Parameter as Exception;
-            Summary.Text = Parameter.Message;
+            Summary.Text = Parameter.Message + " within " + Parameter.TargetSite;
             ErrorInfo.Text = Parameter.StackTrace;
         }
 

Files UWP/YourHome.xaml.cs

@@ -41,14 +41,17 @@ public YourHome()
 
             // Overwrite paths for common locations if Custom Locations setting is enabled
             ApplicationDataContainer localSettings = ApplicationData.Current.LocalSettings;
-            if (localSettings.Values["customLocationsSetting"].Equals(true))
+            if (localSettings.Values["customLocationsSetting"] != null)
             {
-                DesktopPath = localSettings.Values["DesktopLocation"].ToString();
-                DownloadsPath = localSettings.Values["DownloadsLocation"].ToString();
-                DocumentsPath = localSettings.Values["DocumentsLocation"].ToString();
-                PicturesPath = localSettings.Values["PicturesLocation"].ToString();
-                MusicPath = localSettings.Values["MusicLocation"].ToString();
-                VideosPath = localSettings.Values["VideosLocation"].ToString();
+                if (localSettings.Values["customLocationsSetting"].Equals(true))
+                {
+                    DesktopPath = localSettings.Values["DesktopLocation"].ToString();
+                    DownloadsPath = localSettings.Values["DownloadsLocation"].ToString();
+                    DocumentsPath = localSettings.Values["DocumentsLocation"].ToString();
+                    PicturesPath = localSettings.Values["PicturesLocation"].ToString();
+                    MusicPath = localSettings.Values["MusicLocation"].ToString();
+                    VideosPath = localSettings.Values["VideosLocation"].ToString();
+                }
             }
         }
 

FilesUwp.Package/FilesUwp.Package.wapproj

@@ -54,6 +54,7 @@
     <AppInstallerUpdateFrequency>1</AppInstallerUpdateFrequency>
     <AppInstallerCheckForUpdateFrequency>OnApplicationRun</AppInstallerCheckForUpdateFrequency>
     <AppxPackageDir>C:\builds\</AppxPackageDir>
+    <AppxSymbolPackageEnabled>False</AppxSymbolPackageEnabled>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <AppxBundle>Never</AppxBundle>