Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-06 17:13:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed extra newlines

Browse Source
This commit is contained in:
M66B
2020-08-04 15:20:41 +02:00
parent 6515a50c0c
commit 3e43688be2
3 changed files with 42 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
app/src/main/java/eu/faircode/email/HtmlHelper.java
View File

@@ -288,13 +288,7 @@ public class HtmlHelper {
static Document sanitizeCompose(Context context, String html, boolean show_images) {
try {
Document parsed = JsoupEx.parse(html);
// Prevent extra newline at end
Element body = parsed.body();
if (body != null && body.childrenSize() == 1 && "p".equals(body.child(0).tagName()))
body.child(0).tagName("span").appendChild(new Element("br"));
Document parsed = fixEdit(JsoupEx.parse(html));
return sanitize(context, parsed, false, show_images);
} catch (Throwable ex) {
// OutOfMemoryError
@@ -307,6 +301,22 @@ public class HtmlHelper {
}
}
static Document fixEdit(Document document) {
// Prevent extra newline at end
Element body = document.body();
if (body != null && body.childrenSize() == 1) {
Element holder = body.child(0);
if ("p".equals(holder.tagName())) {
holder.tagName("span");
int c = holder.childrenSize();
Element last = (c > 0 ? holder.child(c - 1) : null);
if (last == null || !"br".equals(last.tagName()))
holder.appendChild(new Element("br"));
}
}
return document;
}
static Document sanitizeView(Context context, Document parsed, boolean show_images) {
try {
return sanitize(context, parsed, true, show_images);