mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Format with less white space

This commit is contained in:
M66B 2019-09-02 19:01:17 +02:00
parent 75bc04bd36
commit 63dcefd935
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,12 +206,19 @@ public class HtmlHelper {
// Tables
for (Element col : document.select("th,td")) {
// separate columns by a space
if (col.nextElementSibling() == null) {
if (col.selectFirst("div,table,p") == null)
boolean content = false;
for (Element e : col.children())
if (!e.isBlock() && hasContent(e)) {
content = true;
break;
}
// separate columns
if (content)
if (col.nextElementSibling() == null)
col.appendElement("br");
} else
col.append(" ");
else
col.appendText(" ");
if ("th".equals(col.tagName()))
col.tagName("strong");
@ -345,10 +352,7 @@ public class HtmlHelper {
// Remove block elements displaying nothing
for (Element e : document.select("*"))
if (e.isBlock() &&
!e.hasText() &&
e.select("br").size() == 0 &&
e.select("img").size() == 0)
if (e.isBlock() && !hasContent(e))
e.remove();
// Prevent too many line breaks
@ -362,6 +366,10 @@ public class HtmlHelper {
return (body == null ? "" : body.html());
}
private static boolean hasContent(Element element) {
return (element.hasText() || element.selectFirst("img") != null);
}
static Drawable decodeImage(final Context context, final long id, String source, boolean show, final TextView view) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean compact = prefs.getBoolean("compact", false);