branch develop updated (058caf7 -> 6f3d1e7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git from 058caf7 decomposition de la requete de recherche d'archives (problèmes de lenteur en prod) new 6f3d1e7 fixes #6996Erreur lors de la réception d'un email à qui ilmanque un pièce jointe interne The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 6f3d1e731c3419f5e3b87743761fa93ec62d3966 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 20 12:15:31 2015 +0200 fixes #6996Erreur lors de la réception d'un email à qui ilmanque un pièce jointe interne Summary of changes: .../services/service/EmailServiceImpl.java | 4 ++++ .../services/service/EmailServiceTest.java | 28 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See http://git.codelutin.com/faxtomail.git commit 6f3d1e731c3419f5e3b87743761fa93ec62d3966 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 20 12:15:31 2015 +0200 fixes #6996Erreur lors de la réception d'un email à qui ilmanque un pièce jointe interne --- .../services/service/EmailServiceImpl.java | 4 ++++ .../services/service/EmailServiceTest.java | 28 ++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java index b91e56c..cacafef 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailServiceImpl.java @@ -2125,6 +2125,10 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } } + // remove the remaining cids whose attachment is not in the email (yes, it happens) + // cf #6996 + content = content.replaceAll("(\\w+)=([\"'])cid:.*?([\"'])", ""); + Html2Image html2Image = Html2Image.fromHtml(content); ImageRenderer imageRenderer = html2Image.getImageRenderer().setWidth((int) PageSize.A4.getWidth()); org.w3c.dom.Document doc = html2Image.getParser().getDocument(); diff --git a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java index 18dc4a6..9bf3da7 100644 --- a/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java +++ b/faxtomail-service/src/test/java/com/franciaflex/faxtomail/services/service/EmailServiceTest.java @@ -270,4 +270,32 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // } // // } + +// @Test +// public void testSendEmail() { +// try { +// final String smtpUser = getApplicationConfig().getSmtpUser(); +// final String password = getApplicationConfig().getSmtpPassword(); +// +// Properties properties = new Properties(); +// // set the mail.mime.address.strict to false to avoid +// // javax.mail.internet.AddressException: Domain contains illegal character errors when recipients contains [] +// properties.setProperty("mail.mime.address.strict", "false"); +// +// Session session = Session.getInstance(properties); +// File email = new File("src/test/resources/email.txt"); +// String emailContent = FileUtils.readFileToString(email); +// MimeMessage message = MimeMessageUtils.createMimeMessage(session, emailContent); +// +// Transport tr = session.getTransport("smtp"); +// tr.connect(getApplicationConfig().getSmtpHost(), getApplicationConfig().getSmtpPort(), smtpUser, password); +// message.saveChanges(); // don't forget this +// +// tr.sendMessage(message, new Address[]{ new InternetAddress("tets@test.com") }); +// tr.close(); +// +// } catch (Exception e) { +// e.printStackTrace(); +// } +// } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm