Update MauiSettingsGeneric.cs

AndreasReitberger · Apr 4, 2024 · 7f4e74a · 7f4e74a
1 parent 9d685d5
commit 7f4e74a
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/src/MauiSettings/MauiSettingsGeneric.cs b/src/MauiSettings/MauiSettingsGeneric.cs
@@ -758,7 +758,7 @@ List<MauiSettingAttribute> settingBaseAttributes
                             {
                                 if (settingsInfo.Value is string secureString)
                                 {
-                                    if (settingsInfo.Encrypt)
+                                    if (settingsInfo.Encrypt && !string.IsNullOrEmpty(secureString))
                                     {
                                         if (string.IsNullOrEmpty(key))
                                             throw new ArgumentNullException(nameof(key));
@@ -823,8 +823,10 @@ List<MauiSettingAttribute> settingBaseAttributes
                             {
                                 if (settingsInfo.Value is string secureString)
                                 {
-                                    if (settingsInfo.Encrypt && !string.IsNullOrEmpty(key))
+                                    if (settingsInfo.Encrypt && !string.IsNullOrEmpty(secureString))
                                     {
+                                        if (string.IsNullOrEmpty(key))
+                                            throw new ArgumentNullException(nameof(key));
                                         // Encrypt string
                                         try
                                         {
@@ -877,9 +879,11 @@ List<MauiSettingAttribute> settingBaseAttributes
                             {
                                 if (settingsInfo.Value is string secureString)
                                 {
-                                    if (settingsInfo.Encrypt && !string.IsNullOrEmpty(key))
+                                    if (settingsInfo.Encrypt && !string.IsNullOrEmpty(secureString))
                                     {
-                                        // Decrypt string
+                                        if (string.IsNullOrEmpty(key))
+                                            throw new ArgumentNullException(nameof(key));
+                                        // Encrypt string
                                         try
                                         {
                                             string encryptedString = EncryptionManager.EncryptStringToBase64String(secureString, key);