Author: kmorin Date: 2014-11-30 15:19:17 +0000 (Sun, 30 Nov 2014) New Revision: 709 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/709 Log: refs #6198 Certains emails sont mal interp?\195?\170t?\195?\169s Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java Modified: trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java =================================================================== --- trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-11-30 14:04:47 UTC (rev 708) +++ trunk/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/demande/DemandeUIModel.java 2014-11-30 15:19:17 UTC (rev 709) @@ -51,6 +51,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.commons.mail.util.MimeMessageUtils; import org.nuiton.jaxx.application.swing.tab.TabContentModel; import org.nuiton.util.beans.Binder; import org.nuiton.util.beans.BinderFactory; @@ -878,7 +879,8 @@ protected void decomposeEmail() { try { // ce code peut provoquer une NPE avec les données de test - Message message = new MimeMessage(null, new ByteArrayInputStream(getOriginalEmail().getBytes(StandardCharsets.UTF_8))); + Message message = MimeMessageUtils.createMimeMessage(null, getOriginalEmail()); + Charset charset = FaxToMailServiceUtils.getCharset(message); subject = MimeUtility.decodeText(message.getSubject()); 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-11-30 14:04:47 UTC (rev 708) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/job/MailFilterJob.java 2014-11-30 15:19:17 UTC (rev 709) @@ -209,7 +209,7 @@ checkEmailsOfFolder(account, inbox); } catch (Exception e) { - log.error("Error while getting emails from the mailbox", e); + log.error("Error while getting emails from the mailbox " + account.getHost(), e); } finally { close(inbox); @@ -465,7 +465,7 @@ String headerLine = headerLines.nextElement(); emailSource.append(headerLine).append("\n"); } - String originalContent = IOUtils.toString(message.getInputStream(), charset); + String originalContent = IOUtils.toString(((MimeMessage) message).getRawInputStream(), charset); emailSource.append("\n").append(originalContent); email.setOriginalEmail(emailSource.toString());