mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Added support for element styles

Browse source
This commit is contained in:
M66B 2020-04-22 16:32:35 +02:00
parent 1212e936eb
commit 84003df5a0
1 changed files with 25 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,6 +52,7 @@ import com.steadystate.css.parser.CSSOMParser;
import com.steadystate.css.parser.SACParserCSS3; import com.steadystate.css.parser.SACParserCSS3;
import com.steadystate.css.parser.selectors.ClassConditionImpl; import com.steadystate.css.parser.selectors.ClassConditionImpl;
import com.steadystate.css.parser.selectors.ConditionalSelectorImpl; import com.steadystate.css.parser.selectors.ConditionalSelectorImpl;
import com.steadystate.css.parser.selectors.ElementSelectorImpl;
import org.jsoup.nodes.Attribute; import org.jsoup.nodes.Attribute;
import org.jsoup.nodes.Comment; import org.jsoup.nodes.Comment;
@ -473,20 +474,20 @@ public class HtmlHelper {
// Sanitize styles // Sanitize styles
for (Element element : document.select("*")) { for (Element element : document.select("*")) {
String style = null;
String clazz = element.attr("class"); String clazz = element.attr("class");
// This is to workaround a TextView bug // Workaround TextView not supporting nested colors
List<Element> parents = element.parents(); List<Element> parents = element.parents();
Collections.reverse(parents); Collections.reverse(parents);
String style = null;
for (Element parent : parents) for (Element parent : parents)
style = mergeStyles(style, parent.attr("style"), "color"); style = mergeStyles(style, parent.attr("style"), "color");
style = mergeStyles(style, element.attr("style")); // Class style
style = processStyles(element.tagName(), clazz, style, sheets);
// Process class // Element style
if (!TextUtils.isEmpty(clazz)) style = mergeStyles(style, element.attr("style"));
style = processClass(clazz, style, sheets);
// Process style // Process style
if (!TextUtils.isEmpty(style)) { if (!TextUtils.isEmpty(style)) {
@ -949,14 +950,17 @@ public class HtmlHelper {
return document; return document;
} }
private static String processClass(String clazz, String style, List<CSSStyleSheet> sheets) { private static String processStyles(String tag, String clazz, String style, List<CSSStyleSheet> sheets) {
for (CSSStyleSheet sheet : sheets) for (CSSStyleSheet sheet : sheets)
if (isScreenMedia(sheet.getMedia())) if (isScreenMedia(sheet.getMedia())) {
style = processClass(clazz, style, sheet.getCssRules()); style = processStyles(null, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR);
style = processStyles(tag, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR);
style = processStyles(tag, clazz, style, sheet.getCssRules(), Selector.SAC_CONDITIONAL_SELECTOR);
}
return style; return style;
} }
private static String processClass(String clazz, String style, CSSRuleList rules) { private static String processStyles(String tag, String clazz, String style, CSSRuleList rules, int stype) {
for (int i = 0; rules != null && i < rules.getLength(); i++) { for (int i = 0; rules != null && i < rules.getLength(); i++) {
CSSRule rule = rules.item(i); CSSRule rule = rules.item(i);
switch (rule.getType()) { switch (rule.getType()) {
@ -964,13 +968,22 @@ public class HtmlHelper {
CSSStyleRuleImpl srule = (CSSStyleRuleImpl) rule; CSSStyleRuleImpl srule = (CSSStyleRuleImpl) rule;
for (int j = 0; j < srule.getSelectors().getLength(); j++) { for (int j = 0; j < srule.getSelectors().getLength(); j++) {
Selector selector = srule.getSelectors().item(j); Selector selector = srule.getSelectors().item(j);
if (selector.getSelectorType() != stype)
continue;
switch (selector.getSelectorType()) { switch (selector.getSelectorType()) {
case Selector.SAC_ELEMENT_NODE_SELECTOR:
ElementSelectorImpl eselector = (ElementSelectorImpl) selector;
if (tag == null ?
eselector.getLocalName() == null
: tag.equals(eselector.getLocalName()))
style = mergeStyles(style, srule.getStyle().getCssText());
break;
case Selector.SAC_CONDITIONAL_SELECTOR: case Selector.SAC_CONDITIONAL_SELECTOR:
ConditionalSelectorImpl cselector = (ConditionalSelectorImpl) selector; ConditionalSelectorImpl cselector = (ConditionalSelectorImpl) selector;
if (cselector.getCondition().getConditionType() == SAC_CLASS_CONDITION) { if (cselector.getCondition().getConditionType() == SAC_CLASS_CONDITION) {
ClassConditionImpl ccondition = (ClassConditionImpl) cselector.getCondition(); ClassConditionImpl ccondition = (ClassConditionImpl) cselector.getCondition();
if (clazz.equals(ccondition.getValue())) if (clazz.equals(ccondition.getValue()))
style = mergeStyles(srule.getStyle().getCssText(), style); style = mergeStyles(style, srule.getStyle().getCssText());
} }
break; break;
} }
@ -980,7 +993,7 @@ public class HtmlHelper {
case CSSRule.MEDIA_RULE: case CSSRule.MEDIA_RULE:
CSSMediaRuleImpl mrule = (CSSMediaRuleImpl) rule; CSSMediaRuleImpl mrule = (CSSMediaRuleImpl) rule;
if (isScreenMedia(mrule.getMedia())) if (isScreenMedia(mrule.getMedia()))
style = processClass(clazz, style, mrule.getCssRules()); style = processStyles(tag, clazz, style, mrule.getCssRules(), stype);
break; break;
} }
} }