Bug 454033 - MailUtility: use MimeUtility.encodeText when setting
FileName for FileDataSource
Change-Id: I4dce02e6fe3f22d9029982a8285d7a189ae42f3e
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=454033
Reviewed-on: https://git.eclipse.org/r/41609
Tested-by: Hudson CI
Reviewed-by: Stephan Merkli <sme@bsiag.com>
diff --git a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java
index cee0926..07a94f0 100644
--- a/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java
+++ b/org.eclipse.scout.commons/src/org/eclipse/scout/commons/MailUtility.java
@@ -43,6 +43,7 @@
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
import javax.mail.internet.MimePart;
+import javax.mail.internet.MimeUtility;
import javax.mail.util.ByteArrayDataSource;
import org.eclipse.scout.commons.exception.ProcessingException;
@@ -525,7 +526,7 @@
FileDataSource fds = new FileDataSource(attachment);
DataHandler handler = new DataHandler(fds);
part.setDataHandler(handler);
- part.setFileName(attachment.getName());
+ part.setFileName(MimeUtility.encodeText(attachment.getName(), "UTF-8", null));
multiPart.addBodyPart(part);
}
}
@@ -559,6 +560,9 @@
catch (MessagingException e) {
throw new ProcessingException("Error occured while creating MIME-message", e);
}
+ catch (UnsupportedEncodingException e) {
+ throw new ProcessingException("Error occured while creating MIME-message", e);
+ }
}
private String removeWordTags(String htmlMessage) {
