Fix for writing SMTP credentials to config file

r-smith · Dec 18, 2018 · beaa474 · beaa474
1 parent 06842e7
commit beaa474
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/vmPing/Classes/Configuration.cs b/vmPing/Classes/Configuration.cs
@@ -154,7 +154,7 @@ public static void WriteConfiguration()
                 {
                     configuration.AppendChild(GenerateOptionNode(
                         xmlDocument: xd,
-                        name: "EmailPassword",
+                        name: "EmailUser",
                         value: string.Empty));
                 }
 
@@ -393,11 +393,13 @@ public static void LoadConfiguration()
 
                 if (configuration.TryGetValue("EmailUser", out optionValue))
                 {
-                    ApplicationOptions.EmailUser = DecryptStringAES(optionValue);
+                    if (optionValue.Length > 0)
+                        ApplicationOptions.EmailUser = DecryptStringAES(optionValue);
                 }
                 if (configuration.TryGetValue("EmailPassword", out optionValue))
                 {
-                    ApplicationOptions.EmailPassword = DecryptStringAES(optionValue);
+                    if (optionValue.Length > 0)
+                        ApplicationOptions.EmailPassword = DecryptStringAES(optionValue);
                 }
             }
 

diff --git a/vmPing/Properties/AssemblyInfo.cs b/vmPing/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.10.0")]
-[assembly: AssemblyFileVersion("1.2.10.0")]
+[assembly: AssemblyVersion("1.2.11.0")]
+[assembly: AssemblyFileVersion("1.2.11.0")]
diff --git a/vmPing/Views/OptionsWindow.xaml.cs b/vmPing/Views/OptionsWindow.xaml.cs
@@ -242,6 +242,12 @@ private bool SaveEmailAlertOptions()
                         return false;
                     }
                 }
+                else
+                {
+                    ApplicationOptions.IsEmailAuthenticationRequired = false;
+                    SmtpUsername.Text = string.Empty;
+                    SmtpPassword.Password = string.Empty;
+                }
 
                 ApplicationOptions.IsEmailAlertEnabled = true;
                 ApplicationOptions.EmailServer = SmtpServer.Text;