branch develop updated (a221b4e7 -> 7f47fc3f)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from a221b4e7 fixes #11093 : Boutons disponibles en Archive new 7f47fc3f fixes #11094 : Perte du contenu du mail sur Répondre ou Transféré - Gestion du cas où un email a un contenu HTML vide (et non null) 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 7f47fc3fcd1e4d75562e2c3c18615657f7119652 Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 25 16:24:29 2020 +0100 fixes #11094 : Perte du contenu du mail sur Répondre ou Transféré - Gestion du cas où un email a un contenu HTML vide (et non null) Summary of changes: .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 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 https://gitlab.nuiton.org/codelutin/faxtomail.git commit 7f47fc3fcd1e4d75562e2c3c18615657f7119652 Author: jcouteau <couteau@codelutin.com> Date: Wed Nov 25 16:24:29 2020 +0100 fixes #11094 : Perte du contenu du mail sur Répondre ou Transféré - Gestion du cas où un email a un contenu HTML vide (et non null) --- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java index 19b83461..aaa0cf94 100644 --- a/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java +++ b/faxtomail-ui-swing/src/main/java/com/franciaflex/faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java @@ -234,7 +234,7 @@ public class ReplyFormUIHandler extends AbstractFaxToMailUIHandler<ReplyFormUIMo String plainContent = StringUtils.join(demand.getPlainContent(), CONTENT_SEPARATOR); try(FaxToMailServiceContext serviceContext = getContext().newServiceContext()) { String htmlContent = serviceContext.getEmailService().extractHtmlContent(demand.getAttachment(), demand.getHtmlContent()); - if (htmlContent != null) { + if (htmlContent != null && !htmlContent.isEmpty()) { quotedText = htmlContent; } else { quotedText = plainContent != null ? plainContent.replaceAll("\n", "<br/> ") : ""; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm