Fix: Fixed possible crash when adding a new settings value (#13701)

Author: hishitetsu

src/Files.App/Utils/Serialization/Implementation/CachingJsonSettingsDatabase.cs

@@ -1,15 +1,11 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-
 namespace Files.App.Utils.Serialization.Implementation
 {
 	internal sealed class CachingJsonSettingsDatabase : DefaultJsonSettingsDatabase
 	{
-		private Dictionary<string, object?>? _settingsCache;
+		private IDictionary<string, object?>? _settingsCache;
 
 		public CachingJsonSettingsDatabase(ISettingsSerializer settingsSerializer, IJsonSettingsSerializer jsonSettingsSerializer)
 			: base(settingsSerializer, jsonSettingsSerializer)
@@ -27,7 +23,7 @@ public CachingJsonSettingsDatabase(ISettingsSerializer settingsSerializer, IJson
 			else
 			{
 				if (base.SetValue(key, defaultValue))
-					_settingsCache.Add(key, defaultValue);
+					_settingsCache.TryAdd(key, defaultValue);
 
 				return defaultValue;
 			}
@@ -37,12 +33,8 @@ public CachingJsonSettingsDatabase(ISettingsSerializer settingsSerializer, IJson
 		{
 			_settingsCache ??= GetFreshSettings();
 
-			if (!_settingsCache.ContainsKey(key))
-			{
-				_settingsCache.Add(key, newValue);
-
+			if (_settingsCache.TryAdd(key, newValue))
 				return SaveSettings(_settingsCache);
-			}
 			else
 				return UpdateValueInCache(_settingsCache[key]);
 

src/Files.App/Utils/Serialization/Implementation/DefaultJsonSettingsDatabase.cs

@@ -1,9 +1,7 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
+using System.Collections.Concurrent;
 using System.Text.Json;
 
 namespace Files.App.Utils.Serialization.Implementation
@@ -20,7 +18,7 @@ public DefaultJsonSettingsDatabase(ISettingsSerializer settingsSerializer, IJson
 			JsonSettingsSerializer = jsonSettingsSerializer;
 		}
 
-		protected Dictionary<string, object?> GetFreshSettings()
+		protected IDictionary<string, object?> GetFreshSettings()
 		{
 			string data = SettingsSerializer.ReadFromFile();
 
@@ -29,10 +27,10 @@ public DefaultJsonSettingsDatabase(ISettingsSerializer settingsSerializer, IJson
 				data = "null";
 			}
 
-			return JsonSettingsSerializer.DeserializeFromJson<Dictionary<string, object?>?>(data) ?? new();
+			return JsonSettingsSerializer.DeserializeFromJson<ConcurrentDictionary<string, object?>?>(data) ?? new();
 		}
 
-		protected bool SaveSettings(Dictionary<string, object?> data)
+		protected bool SaveSettings(IDictionary<string, object?> data)
 		{
 			var jsonData = JsonSettingsSerializer.SerializeToJson(data);
 
@@ -58,14 +56,8 @@ public virtual bool SetValue<TValue>(string key, TValue? newValue)
 		{
 			var data = GetFreshSettings();
 
-			if (!data.ContainsKey(key))
-			{
-				data.Add(key, newValue);
-			}
-			else
-			{
+			if (!data.TryAdd(key, newValue))
 				data[key] = newValue;
-			}
 
 			return SaveSettings(data);
 		}
@@ -88,7 +80,7 @@ public virtual bool ImportSettings(object? import)
 			try
 			{
 				// Try convert
-				var data = (Dictionary<string, object?>?)import;
+				var data = (IDictionary<string, object?>?)import;
 				if (data is null)
 				{
 					return false;