Apply code review

Author: d2dyno1

src/Platforms/SecureFolderFS.UI/ServiceImplementation/ResourceLocalizationService.cs

@@ -63,7 +63,7 @@ public ResourceLocalizationService()
         {
             try
             {
-                return ResourceManager.GetString(resourceKey);
+                return ResourceManager.GetString(resourceKey, CurrentCulture);
             }
             catch (Exception ex)
             {

src/Sdk/SecureFolderFS.Sdk/AppModels/PersistedCredentialsModel.cs

@@ -1,15 +1,58 @@
 using System.Collections.Generic;
 using SecureFolderFS.Shared.ComponentModel;
+using SecureFolderFS.Shared.Extensions;
 
 namespace SecureFolderFS.Sdk.AppModels
 {
+    /// <summary>
+    /// Represents a model that stores session credentials of vaults.
+    /// </summary>
     public class PersistedCredentialsModel
     {
+        private readonly Dictionary<string, IKeyUsage> _credentials;
+
+        /// <summary>
+        /// Gets the read-only collection of credentials.
+        /// </summary>
+        public IReadOnlyDictionary<string, IKeyUsage> Credentials => _credentials;
+
+        /// <summary>
+        /// A single instance of <see cref="PersistedCredentialsModel"/>.
+        /// </summary>
         public static PersistedCredentialsModel Instance { get; } = new();
 
+        public PersistedCredentialsModel()
+        {
+            _credentials = new();
+        }
+
         /// <summary>
-        /// Gets the dictionary of credentials associated with a vault ID.
+        /// Adds a new key-value pair to the credential store or updates the value for an existing key.
         /// </summary>
-        public Dictionary<string, IKeyUsage> Credentials { get; } = new();
+        /// <param name="vaultId">The identifier for the vault associated with the key.</param>
+        /// <param name="keyUsage">An implementation of <see cref="IKeyUsage"/> that contains the key to be added or updated.</param>
+        public void SetOrAdd(string vaultId, IKeyUsage keyUsage)
+        {
+            _credentials.Get(vaultId)?.Dispose();
+            _credentials[vaultId] = keyUsage;
+        }
+
+        /// <summary>
+        /// Removes a key-value pair associated with the specified vault identifier from the credential store.
+        /// </summary>
+        /// <param name="vaultId">The identifier for the vault whose associated key-value pair is to be removed.</param>
+        /// <returns>
+        /// <c>true</c> if the key-value pair was successfully removed; otherwise, <c>false</c>.
+        /// </returns>
+        public bool Remove(string vaultId)
+        {
+            if (_credentials.Remove(vaultId, out var value))
+            {
+                value.Dispose();
+                return true;
+            }
+
+            return false;
+        }
     }
 }

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Authentication/PersistedAuthenticationViewModel.cs

@@ -57,7 +57,7 @@ protected override async Task ProvideCredentialsAsync(CancellationToken cancella
         {
             if (!PersistedCredentialsModel.Instance.Credentials.TryGetValue(_vaultId, out var credentials))
             {
-                PersistedCredentialsModel.Instance.Credentials.Remove(_vaultId);
+                PersistedCredentialsModel.Instance.Remove(_vaultId);
                 credentials = ManagedKey.Empty;
             }
 

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/LoginViewModel.cs

@@ -174,7 +174,7 @@ private async Task DiscardSavedCredentialsAsync(CancellationToken cancellationTo
                 var vaultOptions = await VaultService.GetVaultOptionsAsync(_vaultFolder, cancellationToken);
                 if (!string.IsNullOrEmpty(vaultOptions.VaultId))
                 {
-                    PersistedCredentialsModel.Instance.Credentials.Remove(vaultOptions.VaultId);
+                    PersistedCredentialsModel.Instance.Remove(vaultOptions.VaultId);
                     AreCredentialsSaved = false;
 
                     _loginSequence?.Dispose();
@@ -184,8 +184,9 @@ private async Task DiscardSavedCredentialsAsync(CancellationToken cancellationTo
                     RestartLoginProcess();
                 }
             }
-            catch (Exception)
+            catch (Exception ex)
             {
+                CurrentViewModel = new ErrorViewModel(Result.Failure(ex));
             }
         }
 
@@ -215,7 +216,7 @@ private async Task<bool> TryUnlockAsync(CancellationToken cancellationToken = de
                 if (_loginViewMode is LoginViewType.Full or LoginViewType.Constrained && ShouldSaveCredentials && !AreCredentialsSaved)
                 {
                     var keySequenceCopy = KeySequence.Key.ToArray();
-                    PersistedCredentialsModel.Instance.Credentials[_vaultOptions.VaultId] = SecureKey.TakeOwnership(keySequenceCopy);
+                    PersistedCredentialsModel.Instance.SetOrAdd(_vaultOptions.VaultId, SecureKey.TakeOwnership(keySequenceCopy));
                 }
 
                 VaultUnlocked?.Invoke(this, new(unlockContract, _vaultFolder, false));

src/Sdk/SecureFolderFS.Sdk/ViewModels/Controls/Widgets/Health/HealthWidgetViewModel.cs

@@ -99,7 +99,8 @@ private async void HealthViewModel_StateChanged(object? sender, EventArgs e)
 
             // Persist last scanned date, and severity
             var serialized = await StreamSerializer.Instance.TrySerializeToStringAsync(new HealthDataModel(lastScanDate, HealthViewModel.Severity)).ConfigureAwait(false);
-            await WidgetModel.SetWidgetDataAsync(serialized).ConfigureAwait(false);
+            if (!string.IsNullOrEmpty(serialized))
+                await WidgetModel.SetWidgetDataAsync(serialized).ConfigureAwait(false);
         }
 
         /// <inheritdoc/>

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsConfirmationViewModel.cs

@@ -106,7 +106,7 @@ await VaultManagerService.ModifyAuthenticationAsync(_vaultFolder, UnlockContract
             }, cancellationToken);
 
             if (!string.IsNullOrEmpty(configuredOptions.VaultId))
-                PersistedCredentialsModel.Instance.Credentials.Remove(configuredOptions.VaultId);
+                PersistedCredentialsModel.Instance.Remove(configuredOptions.VaultId);
 
             // Revoke (invalidate) old configured credentials if those are different from newly configured ones.
             // If both are the same, the authentication method should override the old ones; otherwise we would be deleting

src/Sdk/SecureFolderFS.Sdk/ViewModels/Views/Credentials/CredentialsResetViewModel.cs

@@ -70,7 +70,7 @@ public async Task ConfirmAsync(CancellationToken cancellationToken)
 
             await VaultManagerService.ModifyAuthenticationAsync(_vaultFolder, _unlockContract, key, newOptions, cancellationToken);
             if (!string.IsNullOrEmpty(configuredOptions.VaultId))
-                PersistedCredentialsModel.Instance.Credentials.Remove(configuredOptions.VaultId);
+                PersistedCredentialsModel.Instance.Remove(configuredOptions.VaultId);
         }
 
         private void RegisterViewModel_CredentialsProvided(object? sender, CredentialsProvidedEventArgs e)