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

Revert "Added workaround for unsupported nested colors" 

This reverts commit 9ed07f1c92.
This commit is contained in:
M66B 2020-02-08 18:43:34 +01:00
parent 9ed07f1c92
commit 3ce83b313f
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -371,7 +371,6 @@ public class HtmlHelper {
sb.append("color:").append(c).append(";"); sb.append("color:").append(c).append(";");
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
element.attr("color", c); element.attr("color", c);
element.attr("x-color", c);
} }
break; break;
@ -657,21 +656,6 @@ public class HtmlHelper {
for (Element div : document.select("div")) for (Element div : document.select("div"))
div.tagName("span"); div.tagName("span");
// Workaround: fromHtml does not support nested colors
for (Element span : document.select("span")) {
String c = span.attr("x-color");
if (!TextUtils.isEmpty(c)) {
span.removeAttr("x-color");
for (Element cspan : span.children().select("span")) {
String style = cspan.attr("style");
if (TextUtils.isEmpty(style))
cspan.attr("style", "color:" + c + ";");
else if (!style.contains("color:"))
cspan.attr(style + "color:" + c + ";");
}
}
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N)
for (Element span : document.select("span")) for (Element span : document.select("span"))
if (!TextUtils.isEmpty(span.attr("color"))) if (!TextUtils.isEmpty(span.attr("color")))