Author: echatellier Date: 2014-07-04 11:56:34 +0200 (Fri, 04 Jul 2014) New Revision: 343 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/343 Log: Differenciation du nom des contenu html/plain Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-04 08:28:12 UTC (rev 342) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-07-04 09:56:34 UTC (rev 343) @@ -408,23 +408,22 @@ List<Attachment> attachments = new ArrayList<>(); if (message.isMimeType("multipart/*")) { + + // manage boundary id String htmlContent = decomposeMultipartEmail(attachments, message, email, emailService); if (htmlContent != null) { if (log.isDebugEnabled()) { log.debug("Converting html content to pdf : " + message.getSubject()); } - Attachment attachment = convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.fileName")); + Attachment attachment = convertHTMLToPdf(attachments, htmlContent, t("faxtomail.email.content.attachment.htmlfileName")); if (attachment != null) { attachments.add(attachment); } } - } else { - // String content = IOUtils.toString(message.getInputStream(), charset); - // email.setPlainContent(content); -// Charset charset = FaxToMailServiceUtils.getCharset(bp); + // convertit le contenu texte en PDF String content = IOUtils.toString(message.getInputStream(), charset); - Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.fileName")); + Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); attachments.add(0, attachment); } @@ -468,6 +467,7 @@ protected String decomposeMultipartEmail(List<Attachment> attachments, Part part, Email email, EmailService emailService) throws Exception { String result = null; + DataSource dataSource = part.getDataHandler().getDataSource(); MimeMultipart mimeMultipart = new MimeMultipart(dataSource); int multiPartCount = mimeMultipart.getCount(); @@ -478,11 +478,12 @@ // if it is a text part, then this is the email content String disposition = bp.getDisposition(); if (bp.isMimeType("text/*") && !Part.ATTACHMENT.equals(disposition)) { + Charset charset = FaxToMailServiceUtils.getCharset(bp); String content = IOUtils.toString(bp.getInputStream(), charset); if (bp.isMimeType("text/plain")) { - Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.fileName")); + Attachment attachment = convertTextToPdf(content, t("faxtomail.email.content.attachment.plainfileName")); attachments.add(attachment); } else { Modified: trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties =================================================================== --- trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-07-04 08:28:12 UTC (rev 342) +++ trunk/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties 2014-07-04 09:56:34 UTC (rev 343) @@ -34,6 +34,7 @@ com.franciaflex.faxtomail.persistence.entities.MailField.SAV_NB=Quantité de SAV com.franciaflex.faxtomail.persistence.entities.MailField.SENDER=Émetteur com.franciaflex.faxtomail.persistence.entities.MailField.TAKEN_BY=Pris par -faxtomail.email.content.attachment.fileName=contenu du mail +faxtomail.email.content.attachment.htmlfileName=contenu html du mail +faxtomail.email.content.attachment.plainfileName=contenu texte du mail faxtomail.email.projectReference.default= faxtomail.email.subject.re=Re \: %s