From 9f82f9de8baef22d0eabafb3ce3153b56c8e618d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 12 Sep 2019 18:53:57 +0200
Subject: [PATCH] Refactoring

---
 app/src/main/java/eu/faircode/email/HtmlHelper.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 09d34da739..a5eabef5b9 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -141,7 +141,7 @@ public class HtmlHelper {
 
         // Remove new lines without surrounding content
         for (Element br : document.select("br"))
-            if (br.parent() != null && !hasContent(br.parent().childNodes()))
+            if (br.parent() != null && !hasVisibleContent(br.parent().childNodes()))
                 br.tagName("span");
 
         // Paragraphs
@@ -218,7 +218,7 @@ public class HtmlHelper {
         // Tables
         for (Element col : document.select("th,td")) {
             // separate columns
-            if (hasContent(col.childNodes()))
+            if (hasVisibleContent(col.childNodes()))
                 if (col.nextElementSibling() != null)
                     col.appendText(" ");
 
@@ -230,7 +230,7 @@ public class HtmlHelper {
 
         for (Element row : document.select("tr")) {
             row.tagName("span");
-            if (hasContent(row.childNodes())) {
+            if (hasVisibleContent(row.childNodes())) {
                 Element next = row.nextElementSibling();
                 if (next != null && "tr".equals(next.tagName()))
                     row.appendElement("br");
@@ -361,7 +361,7 @@ public class HtmlHelper {
         // Selective new lines
         for (Element div : document.select("div"))
             if (div.children().select("div").size() == 0 &&
-                    hasContent(div.childNodes())) {
+                    hasVisibleContent(div.childNodes())) {
                 div.appendElement("br");
                 div.appendElement("br");
             }
@@ -373,7 +373,7 @@ public class HtmlHelper {
         return (body == null ? "" : body.html());
     }
 
-    private static boolean hasContent(List<Node> nodes) {
+    private static boolean hasVisibleContent(List<Node> nodes) {
         for (Node node : nodes)
             if (node instanceof TextNode && !((TextNode) node).isBlank())
                 return true;