From 54598cbce0745022947325a916f5b0c9cc48a4b7 Mon Sep 17 00:00:00 2001 From: jomu Date: Thu, 14 Sep 2017 23:37:40 +0000 Subject: [PATCH] added missing encoding to subject --- .../shared/account/business/mail/MailService.java | 12 ++++++++---- .../account/business/mail/MailTemplateService.java | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/account/src/main/java/de/muehlencord/shared/account/business/mail/MailService.java b/account/src/main/java/de/muehlencord/shared/account/business/mail/MailService.java index 1b8b5c5..609cf02 100644 --- a/account/src/main/java/de/muehlencord/shared/account/business/mail/MailService.java +++ b/account/src/main/java/de/muehlencord/shared/account/business/mail/MailService.java @@ -79,12 +79,16 @@ public class MailService implements Serializable { } public String sendHTMLMail(String recipient, String subject, MailDatamodel dataModel, String htmlTemplateName, String plainTemplateName) throws MailException { - return sendHTMLMail(recipient, null, null, subject, dataModel, htmlTemplateName, plainTemplateName); + return sendHTMLMail(recipient, null, null, subject, dataModel, htmlTemplateName, plainTemplateName, "UTF-8"); + } + + public String sendHTMLMail(String recipient, String ccRecipient, String bccRecipient, String subject, MailDatamodel dataModel, String htmlTemplateName, String plainTemplateName) throws MailException { + return sendHTMLMail(recipient, ccRecipient, bccRecipient, subject, dataModel, htmlTemplateName, plainTemplateName, "UTF-8"); } - public String sendHTMLMail(String recipient, String ccRecipient, String bccRecipient, String subject, MailDatamodel dataModel, String htmlTemplateName, String plainTemplateName) throws MailException { + public String sendHTMLMail(String recipient, String ccRecipient, String bccRecipient, String subject, MailDatamodel dataModel, String htmlTemplateName, String plainTemplateName, String encoding) throws MailException { try { - Message message = new MimeMessage(mailSession); + MimeMessage message = new MimeMessage(mailSession); message.setFrom(); // use default from message.setRecipients(Message.RecipientType.TO, InternetAddress.parse(recipient, false)); if (ccRecipient != null) { @@ -94,7 +98,7 @@ public class MailService implements Serializable { message.setRecipients(Message.RecipientType.BCC, InternetAddress.parse(bccRecipient, false)); } - message.setSubject(subject); + message.setSubject(subject, encoding); String htmlBody = mailTemplateService.getStringFromTemplate(htmlTemplateName, dataModel); diff --git a/account/src/main/java/de/muehlencord/shared/account/business/mail/MailTemplateService.java b/account/src/main/java/de/muehlencord/shared/account/business/mail/MailTemplateService.java index d730863..274b073 100644 --- a/account/src/main/java/de/muehlencord/shared/account/business/mail/MailTemplateService.java +++ b/account/src/main/java/de/muehlencord/shared/account/business/mail/MailTemplateService.java @@ -40,7 +40,7 @@ public class MailTemplateService implements Serializable { } Configuration configuration = new Configuration(Configuration.VERSION_2_3_23); - configuration.setDefaultEncoding("UTF-8"); + configuration.setDefaultEncoding("UTF-8"); // FIXME make encoding configurable configuration.setTemplateExceptionHandler(TemplateExceptionHandler.RETHROW_HANDLER); StringTemplateLoader stringLoader = new StringTemplateLoader();