fix: Fix null ref in LoadBookmarksFromStorage

Author: sboulema

CodeNav.Shared/Helpers/BookmarkHelper.cs

@@ -191,7 +191,7 @@ public static async Task<Dictionary<string, int>> LoadBookmarksFromStorage(strin
             var solutionStorage = await SolutionStorageHelper.Load<SolutionStorageModel>().ConfigureAwait(false);
 
             var storageItem = solutionStorage?.Documents?
-                .FirstOrDefault(item => item.FilePath.Equals(filePath));
+                .FirstOrDefault(item => item?.FilePath?.Equals(filePath) == true);
 
             return storageItem?.Bookmarks ?? new Dictionary<string, int>();
         }

CodeNav.Shared/Models/CodeDocumentViewModel.cs

@@ -10,19 +10,10 @@ namespace CodeNav.Models
     [DataContract]
     public class CodeDocumentViewModel : ObservableObject
     {
-        public CodeDocumentViewModel()
+        private List<CodeItem> _codeDocument = new List<CodeItem>();
+        public List<CodeItem> CodeDocument
         {
-            _codeDocument = new List<CodeItem>();
-            Bookmarks = new Dictionary<string, int>();
-            HistoryItems = new List<CodeItem>();
-        }
-
-        private List<CodeItem> _codeDocument;
-        public List<CodeItem> CodeDocument {
-            get
-            {
-                return _codeDocument;
-            }
+            get => _codeDocument;
             set
             {
                 SetProperty(ref _codeDocument, value);
@@ -42,10 +33,7 @@ public List<CodeItem> CodeDocumentTop
 
                 return result;
             }
-            set
-            {
-                NotifyPropertyChanged();
-            }
+            set => NotifyPropertyChanged();
         }
 
         private void TraverseDepth(List<CodeItem> items, List<CodeItem> result, int depth)
@@ -79,12 +67,7 @@ private void TraverseDepth(List<CodeItem> items, List<CodeItem> result, int dept
         public SortOrderEnum SortOrder;
 
         public Visibility BookmarksAvailable
-        {
-            get
-            {
-                return Bookmarks.Any() ? Visibility.Visible : Visibility.Collapsed;
-            }
-        }
+            => Bookmarks.Any() ? Visibility.Visible : Visibility.Collapsed;
 
         public void AddBookmark(string id, int bookmarkStyleIndex)
         {
@@ -119,25 +102,19 @@ public void ClearBookmarks()
         private string _filterText;
         public string FilterText
         {
-            get
-            {
-                return _filterText;
-            }
+            get => _filterText;
             set
             {
                 _filterText = value;
                 NotifyPropertyChanged("ClearFilterVisibility");
             }
         }
 
-        private Dictionary<string, int> _bookmarks;
+        private Dictionary<string, int> _bookmarks = new Dictionary<string, int>();
         [DataMember]
         public Dictionary<string, int> Bookmarks
         {
-            get
-            {
-                return _bookmarks;
-            }
+            get => _bookmarks;
             set
             {
                 _bookmarks = value;
@@ -148,12 +125,12 @@ public Dictionary<string, int> Bookmarks
         public bool FilterOnBookmarks;
 
         [DataMember]
-        public string FilePath;
+        public string FilePath = string.Empty;
 
         [DataMember]
-        public List<BookmarkStyle> BookmarkStyles;
+        public List<BookmarkStyle> BookmarkStyles = new List<BookmarkStyle>();
 
         [DataMember]
-        public List<CodeItem> HistoryItems;
+        public List<CodeItem> HistoryItems = new List<CodeItem>();
     }
 }