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

Add context

This commit is contained in:
M66B 2023-09-22 20:26:14 +02:00
parent 6ddebf90f8
commit 06d63aec7c
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/faircode/email/AdapterMessage.java
View File

@ -7391,7 +7391,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
List<CSSStyleSheet> sheets =
HtmlHelper.parseStyles(d.head().select("style"));
for (Element element : d.select("*")) {
String computed = HtmlHelper.processStyles(
String computed = HtmlHelper.processStyles(context,
element.tagName(),
element.className(),
element.attr("style"),

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

@ -5858,7 +5858,7 @@ public class FragmentCompose extends FragmentBase {
for (Element element : e.select("*")) {
String tag = element.tagName();
String clazz = element.attr("class");
String style = HtmlHelper.processStyles(tag, clazz, null, sheets);
String style = HtmlHelper.processStyles(context, tag, clazz, null, sheets);
style = HtmlHelper.mergeStyles(style, element.attr("style"));
if (!TextUtils.isEmpty(style))
element.attr("style", style);

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

@ -663,7 +663,7 @@ public class HtmlHelper {
// Class style
String tag = element.tagName();
String clazz = element.className();
String style = processStyles(tag, clazz, null, sheets);
String style = processStyles(context, tag, clazz, null, sheets);
// Element style
style = mergeStyles(style, element.attr("style"));
@ -1780,17 +1780,17 @@ public class HtmlHelper {
return sheets;
}
static String processStyles(String tag, String clazz, String style, List<CSSStyleSheet> sheets) {
static String processStyles(Context context, String tag, String clazz, String style, List<CSSStyleSheet> sheets) {
for (CSSStyleSheet sheet : sheets)
if (isScreenMedia(sheet.getMedia())) {
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);
if (isScreenMedia(context, sheet.getMedia())) {
style = processStyles(context, null, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR);
style = processStyles(context, tag, clazz, style, sheet.getCssRules(), Selector.SAC_ELEMENT_NODE_SELECTOR);
style = processStyles(context, tag, clazz, style, sheet.getCssRules(), Selector.SAC_CONDITIONAL_SELECTOR);
}
return style;
}
private static String processStyles(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) {
for (int i = 0; rules != null && i < rules.getLength(); i++) {
CSSRule rule = rules.item(i);
switch (rule.getType()) {
@ -1829,15 +1829,15 @@ public class HtmlHelper {
case CSSRule.MEDIA_RULE:
CSSMediaRuleImpl mrule = (CSSMediaRuleImpl) rule;
if (isScreenMedia(mrule.getMedia()))
style = processStyles(tag, clazz, style, mrule.getCssRules(), stype);
if (isScreenMedia(context, mrule.getMedia()))
style = processStyles(context, tag, clazz, style, mrule.getCssRules(), stype);
break;
}
}
return style;
}
private static boolean isScreenMedia(MediaList media) {
private static boolean isScreenMedia(Context context, MediaList media) {
// 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
if (media instanceof MediaListImpl) {