This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit f465ee875dd3faac1ddd86b00131b2e338167b6d Author: jcouteau <couteau@codelutin.com> Date: Thu Aug 22 09:01:04 2019 +0200 Add text content to email and clean code --- .../faxtomail/services/service/EmailService.java | 2 +- .../faxtomail/services/service/EmailServiceImpl.java | 13 ++++++++++++- .../faxtomail/services/service/EmailServiceTest.java | 9 ++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java index 27dcbcc1..e077331c 100644 --- a/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java +++ b/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/EmailService.java @@ -129,7 +129,7 @@ public interface EmailService extends FaxToMailService { void unlockMails(List<String> mailLockIds); void sendHtmlEmail(String from, String to, String subject, String content, String signing) - throws EmailException, MessagingException, IOException; + throws EmailException; void updateRangeRowsWithEdiReturns(); 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 b8d6b6d7..bbd46ae7 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 @@ -1216,6 +1216,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe } message.setHtmlMsg(toSendContent.toString()); + message.setTextMsg(toSendContent.toString()); for (AttachmentFile attachmentFile : attachments) { // Create the attachment @@ -1393,7 +1394,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe @Override public void sendHtmlEmail(String from, String to, String subject, String content, String signing) - throws EmailException, MessagingException, IOException { + throws EmailException { final String smtpUser = getApplicationConfig().getSmtpUser(); final String password = getApplicationConfig().getSmtpPassword(); @@ -1421,6 +1422,7 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe toSendContent.append("</body></html>"); message.setHtmlMsg(toSendContent.toString()); + message.setTextMsg(toSendContent.toString()); message.send(); } @@ -2359,6 +2361,15 @@ public class EmailServiceImpl extends FaxToMailServiceSupport implements EmailSe //cf #10123 content = content.replaceAll("font-size:0", "font-size:1"); + + content = content.replaceAll("(.+) width=([\"])(.+)([\"])", "$1"); + content = content.replaceAll("(.+) width=(['])(.+)(['])", "$1"); + content = content.replaceAll("(.+) height=([\"])(.+)([\"])", "$1"); + content = content.replaceAll("(.+) height=(['])(.+)(['])", "$1"); + content = content.replaceAll("(.+) style=([\"])(.+)([\"])", "$1"); + content = content.replaceAll("(.+) style=(['])(.+)(['])", "$1"); + content = content.replaceAll(" ",""); + contents.add(content); } } 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 c3b597a4..56296ead 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 @@ -150,10 +150,9 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { /** * Generate email detail as pdf test. - * @throws InterruptedException */ @Test - public void testEmailDetailsPdf() throws InterruptedException { + public void testEmailDetailsPdf() { // select a random test email PaginationParameter paginationParameter = PaginationParameter.of(0, 1); @@ -411,10 +410,10 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { } - @Test /** * Test that jbig2 dependency is present so that pdf generation is correct */ + @Test public void test10004jbig2dependency() throws IOException { File pdf = new File("src/test/resources/pdf/10004.pdf"); File image = new File("src/test/resources/pdf/10004-page1.png"); @@ -431,7 +430,6 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { Assert.assertTrue(compareImagePixels(in, pageImage)); } - // @Test /** * Test that generatedPdfPages are always in order */ @@ -451,10 +449,10 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { // Assert.assertTrue(compareImagePixels(in, pageImage)); // } - @Test /** * Test that Imaging (JAI) Image I/O Tools is present so that pdf generation is correct */ + @Test public void test10075() throws IOException { File pdf = new File("src/test/resources/pdf/10075.pdf"); @@ -470,6 +468,7 @@ public class EmailServiceTest extends AbstractFaxToMailServiceTest { + private final int ALPHA = 24; private final int RED = 16; private final int GREEN = 8; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.