mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-19 18:35:34 +00:00
Code Issues Releases Wiki Activity

Inherit colors

Browse source
This commit is contained in:
M66B 2020-04-21 20:29:58 +02:00
parent 0110fb4ec9
commit ca23ea37bf
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/HtmlHelper.java
View file

@ -467,7 +467,15 @@ public class HtmlHelper {
// Sanitize styles // Sanitize styles
for (Element element : document.select("*")) { for (Element element : document.select("*")) {
String clazz = element.attr("class"); String clazz = element.attr("class");
String style = element.attr("style");
// This is to workaround a TextView bug
List<Element> parents = element.parents();
Collections.reverse(parents);
String style = null;
for (Element parent : parents)
style = mergeStyles(style, parent.attr("style"), "color");
style = mergeStyles(style, element.attr("style"));
// Process class // Process class
if (!TextUtils.isEmpty(clazz)) if (!TextUtils.isEmpty(clazz))
@ -989,6 +997,10 @@ public class HtmlHelper {
} }
private static String mergeStyles(String base, String style) { private static String mergeStyles(String base, String style) {
return mergeStyles(base, style, null);
}
private static String mergeStyles(String base, String style, String selector) {
Map<String, String> result = new HashMap<>(); Map<String, String> result = new HashMap<>();
List<String> params = new ArrayList<>(); List<String> params = new ArrayList<>();
@ -1001,6 +1013,7 @@ public class HtmlHelper {
int colon = param.indexOf(':'); int colon = param.indexOf(':');
if (colon > 0) { if (colon > 0) {
String key = param.substring(0, colon).trim().toLowerCase(Locale.ROOT); String key = param.substring(0, colon).trim().toLowerCase(Locale.ROOT);
if (selector == null || selector.equals(key))
result.put(key, param); result.put(key, param);
} else } else
Log.w("Invalid style param=" + param); Log.w("Invalid style param=" + param);