branch develop updated (7f47fc3f -> 72c63d4d)
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 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) new 72c63d4d :bug: fixes #11116: Lors d’une réponse à un mail, du code s’affiche sur les mails qui ne sont pas en texte brut ce qui gêne la lisibilité. 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 72c63d4d340ee9ebf834ce950f12b8ef74b150df Author: jcouteau <couteau@codelutin.com> Date: Thu Dec 10 16:37:38 2020 +0100 :bug: fixes #11116: Lors d’une réponse à un mail, du code s’affiche sur les mails qui ne sont pas en texte brut ce qui gêne la lisibilité. Summary of changes: .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 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 72c63d4d340ee9ebf834ce950f12b8ef74b150df Author: jcouteau <couteau@codelutin.com> Date: Thu Dec 10 16:37:38 2020 +0100 :bug: fixes #11116: Lors d’une réponse à un mail, du code s’affiche sur les mails qui ne sont pas en texte brut ce qui gêne la lisibilité. --- .../faxtomail/ui/swing/content/reply/ReplyFormUIHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 aaa0cf94..3e496c98 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,10 +234,10 @@ 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 && !htmlContent.isEmpty()) { - quotedText = htmlContent; + if (plainContent != null && !plainContent.isEmpty()) { + quotedText = plainContent.replaceAll("\n", "<br/> "); } else { - quotedText = plainContent != null ? plainContent.replaceAll("\n", "<br/> ") : ""; + quotedText = htmlContent; } } catch (IOException eee){ log.error("Error setting maxAttachmentLength",eee); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm