DNN-30859 - Set AlternativeView.Encoding with bodyEncoding

- This is to ensure AlternativeView encoding is always consistent with bodyEncoding and not relying on the body text - Extract the code to AddAlternateView method to allow UTs
dnnsoftware · Jul 19, 2019 · 455b8cb · 455b8cb
1 parent 2ad29fc
commit 455b8cb
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/DNN Platform/Library/Services/Mail/Mail.cs b/DNN Platform/Library/Services/Mail/Mail.cs
@@ -104,15 +104,7 @@ private static string SendMailInternal(MailMessage mailMessage, string subject,
             mailMessage.Subject = HtmlUtils.StripWhiteSpace(subject, true);
             mailMessage.BodyEncoding = bodyEncoding;
 
-            //added support for multipart html messages
-            //add text part as alternate view
-            var PlainView = AlternateView.CreateAlternateViewFromString(ConvertToText(body), null, "text/plain");
-            mailMessage.AlternateViews.Add(PlainView);
-            if (mailMessage.IsBodyHtml)
-            {
-                var HTMLView = AlternateView.CreateAlternateViewFromString(body, null, "text/html");
-                mailMessage.AlternateViews.Add(HTMLView);
-            }
+            AddAlternateView(mailMessage, body, bodyEncoding);
 
             smtpServer = smtpServer.Trim();
             if (SmtpServerRegex.IsMatch(smtpServer))
@@ -198,6 +190,19 @@ private static string SendMailInternal(MailMessage mailMessage, string subject,
             return retValue;
         }
 
+        internal static void AddAlternateView(MailMessage mailMessage, string body, Encoding bodyEncoding)
+        {   
+            //added support for multipart html messages
+            //add text part as alternate view
+            var PlainView = AlternateView.CreateAlternateViewFromString(ConvertToText(body), bodyEncoding, "text/plain");
+            mailMessage.AlternateViews.Add(PlainView);
+            if (mailMessage.IsBodyHtml)
+            {
+                var HTMLView = AlternateView.CreateAlternateViewFromString(body, bodyEncoding, "text/html");
+                mailMessage.AlternateViews.Add(HTMLView);
+            }
+        }
+
         #endregion
 
         #region Public Methods