Fix: Fixed ArgumentNullException in DefaultSettingsSerializer.ReadFromFile (#15900)

hishitetsu · web-flow · commit 1bc60d5c31aa · 2024-07-30T10:44:36.000-04:00
diff --git a/src/Files.App/Services/Settings/FileTagsSettingsService.cs b/src/Files.App/Services/Settings/FileTagsSettingsService.cs
@@ -30,11 +30,12 @@ internal sealed class FileTagsSettingsService : BaseJsonSettings, IFileTagsSetti
 		public FileTagsSettingsService()
 		{
 			SettingsSerializer = new DefaultSettingsSerializer();
-			JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
-			JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
 
 			Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path,
 				Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.FileTagSettingsFileName));
+
+			JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
+			JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
 		}
 
 		public IList<TagViewModel> FileTagList
diff --git a/src/Files.App/Services/Settings/UserSettingsService.cs b/src/Files.App/Services/Settings/UserSettingsService.cs
@@ -59,10 +59,11 @@ public IAppSettingsService AppSettingsService
 		public UserSettingsService()
 		{
 			SettingsSerializer = new DefaultSettingsSerializer();
-			JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
-			JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
 
 			Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.UserSettingsFileName));
+
+			JsonSettingsSerializer = new DefaultJsonSettingsSerializer();
+			JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);
 		}
 
 		public override object ExportSettings()

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,12 @@ internal sealed class FileTagsSettingsService : BaseJsonSettings, IFileTagsSetti`
`30`	`30`	`public FileTagsSettingsService()`
`31`	`31`	`{`
`32`	`32`	`SettingsSerializer = new DefaultSettingsSerializer();`
`33`		`- JsonSettingsSerializer = new DefaultJsonSettingsSerializer();`
`34`		`- JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);`
`35`	`33`
`36`	`34`	`Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path,`
`37`	`35`	`Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.FileTagSettingsFileName));`
	`36`	`+`
	`37`	`+ JsonSettingsSerializer = new DefaultJsonSettingsSerializer();`
	`38`	`+ JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`public IList<TagViewModel> FileTagList`
Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,11 @@ public IAppSettingsService AppSettingsService`
`59`	`59`	`public UserSettingsService()`
`60`	`60`	`{`
`61`	`61`	`SettingsSerializer = new DefaultSettingsSerializer();`
`62`		`- JsonSettingsSerializer = new DefaultJsonSettingsSerializer();`
`63`		`- JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);`
`64`	`62`
`65`	`63`	`Initialize(Path.Combine(ApplicationData.Current.LocalFolder.Path, Constants.LocalSettings.SettingsFolderName, Constants.LocalSettings.UserSettingsFileName));`
	`64`	`+`
	`65`	`+ JsonSettingsSerializer = new DefaultJsonSettingsSerializer();`
	`66`	`+ JsonSettingsDatabase = new CachingJsonSettingsDatabase(SettingsSerializer, JsonSettingsSerializer);`
`66`	`67`	`}`
`67`	`68`
`68`	`69`	`public override object ExportSettings()`