msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Cache CSS media list results

Browse Source
master
M66B 1 month ago
parent bcb0db1807
commit fdbf044d77
3 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File

6
app/src/main/java/eu/faircode/email/ActivityCode.java
Unescape View File

@ -55,6 +55,7 @@ import org.jsoup.parser.ParseError;
import org.jsoup.parser.ParseErrorList; import org.jsoup.parser.ParseErrorList;
import org.jsoup.parser.Parser; import org.jsoup.parser.Parser;
import org.w3c.dom.css.CSSStyleSheet; import org.w3c.dom.css.CSSStyleSheet;
import org.w3c.dom.stylesheets.MediaList;
import java.io.File; import java.io.File;
import java.io.FileInputStream; import java.io.FileInputStream;
@ -62,7 +63,9 @@ import java.io.FileNotFoundException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
public class ActivityCode extends ActivityBase { public class ActivityCode extends ActivityBase {
private WebView wvCode; private WebView wvCode;
@ -356,12 +359,13 @@ public class ActivityCode extends ActivityBase {
if (sanitize) { if (sanitize) {
List<CSSStyleSheet> sheets = List<CSSStyleSheet> sheets =
HtmlHelper.parseStyles(d.head().select("style")); HtmlHelper.parseStyles(d.head().select("style"));
Map<MediaList, Boolean> cache = new HashMap<>();
for (Element element : d.select("*")) { for (Element element : d.select("*")) {
String computed = HtmlHelper.processStyles(context, String computed = HtmlHelper.processStyles(context,
element.tagName(), element.tagName(),
element.className(), element.className(),
element.attr("style"), element.attr("style"),
sheets); sheets, cache);
if (!TextUtils.isEmpty(computed)) if (!TextUtils.isEmpty(computed))
element.attr("x-computed", computed); element.attr("x-computed", computed);
} }

4
app/src/main/java/eu/faircode/email/FragmentCompose.java
Unescape View File

@ -177,6 +177,7 @@ import org.jsoup.select.Elements;
import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpError;
import org.openintents.openpgp.util.OpenPgpApi; import org.openintents.openpgp.util.OpenPgpApi;
import org.w3c.dom.css.CSSStyleSheet; import org.w3c.dom.css.CSSStyleSheet;
import org.w3c.dom.stylesheets.MediaList;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.BufferedOutputStream; import java.io.BufferedOutputStream;
@ -6371,10 +6372,11 @@ public class FragmentCompose extends FragmentBase {
// Apply styles // Apply styles
List<CSSStyleSheet> sheets = HtmlHelper.parseStyles(d.head().select("style")); List<CSSStyleSheet> sheets = HtmlHelper.parseStyles(d.head().select("style"));
Map<MediaList, Boolean> cache = new HashMap<>();
for (Element element : e.select("*")) { for (Element element : e.select("*")) {
String tag = element.tagName(); String tag = element.tagName();
String clazz = element.attr("class"); String clazz = element.attr("class");
String style = HtmlHelper.processStyles(context, tag, clazz, null, sheets); String style = HtmlHelper.processStyles(context, tag, clazz, null, sheets, cache);
style = HtmlHelper.mergeStyles(style, element.attr("style")); style = HtmlHelper.mergeStyles(style, element.attr("style"));
if (!TextUtils.isEmpty(style)) if (!TextUtils.isEmpty(style))
element.attr("style", style); element.attr("style", style);

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

@ -660,11 +660,12 @@ public class HtmlHelper {
} }
// Sanitize styles // Sanitize styles
Map<MediaList, Boolean> cache = new HashMap<>();
for (Element element : document.select("*")) { for (Element element : document.select("*")) {
// Class style // Class style
String tag = element.tagName(); String tag = element.tagName();
String clazz = element.className(); String clazz = element.className();
String style = processStyles(context, tag, clazz, null, sheets); String style = processStyles(context, tag, clazz, null, sheets, cache);
// Element style // Element style
style = mergeStyles(style, element.attr("style")); style = mergeStyles(style, element.attr("style"));
@ -1855,17 +1856,17 @@ public class HtmlHelper {
return sheets; return sheets;
} }
static String processStyles(Context context, String tag, String clazz, String style, List<CSSStyleSheet> sheets) { static String processStyles(Context context, String tag, String clazz, String style, List<CSSStyleSheet> sheets, Map<MediaList, Boolean> cache) {
for (CSSStyleSheet sheet : sheets) for (CSSStyleSheet sheet : sheets)
if (isScreenMedia(context, sheet.getMedia())) { if (isScreenMedia(context, sheet.getMedia(), cache)) {
style = processStyles(context, null, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR); style = processStyles(context, null, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR, cache);
style = processStyles(context, tag, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR); style = processStyles(context, tag, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR, cache);
style = processStyles(context, tag, clazz, style, sheet.getCssRules(), Selector.SAC_CONDITIONAL_SELECTOR); style = processStyles(context, tag, clazz, style, sheet.getCssRules(), Selector.SAC_CONDITIONAL_SELECTOR, cache);
} }
return style; return style;
} }
private static String processStyles(Context context, String tag, String clazz, String style, CSSRuleList rules, int stype) { private static String processStyles(Context context, String tag, String clazz, String style, CSSRuleList rules, int stype, Map<MediaList, Boolean> cache) {
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()) {
@ -1904,15 +1905,25 @@ public class HtmlHelper {
case CSSRule.MEDIA_RULE: case CSSRule.MEDIA_RULE:
CSSMediaRuleImpl mrule = (CSSMediaRuleImpl) rule; CSSMediaRuleImpl mrule = (CSSMediaRuleImpl) rule;
if (isScreenMedia(context, mrule.getMedia())) if (isScreenMedia(context, mrule.getMedia(), cache))
style = processStyles(context, tag, clazz, style, mrule.getCssRules(), stype); style = processStyles(context, tag, clazz, style, mrule.getCssRules(), stype, cache);
break; break;
} }
} }
return style; return style;
} }
private static boolean isScreenMedia(Context context, MediaList media) { private static boolean isScreenMedia(Context context, MediaList media, Map<MediaList, Boolean> cache) {
if (cache != null && cache.containsKey(media))
return cache.get(media);
boolean is = _isScreenMedia(context, media);
if (cache != null)
cache.put(media, is);
return is;
}
private static boolean _isScreenMedia(Context context, MediaList media) {
// https://developer.mozilla.org/en-US/docs/Web/CSS/Media_Queries/Using_media_queries // https://developer.mozilla.org/en-US/docs/Web/CSS/Media_Queries/Using_media_queries
// https://developers.google.com/gmail/design/reference/supported_css#supported_types // https://developers.google.com/gmail/design/reference/supported_css#supported_types
if (media instanceof MediaListImpl) { if (media instanceof MediaListImpl) {

Write Preview
Loading…
Cancel
Save