Html: refactoring

This commit is contained in:
M66B 2023-11-16 12:42:47 +01:00
parent 5cd8f50965
commit 1c5ba52048
4 changed files with 1226 additions and 1186 deletions

View File

@ -351,9 +351,9 @@ public class ActivityCode extends ActivityBase {
if (sanitize) { if (sanitize) {
List<CSSStyleSheet> sheets = List<CSSStyleSheet> sheets =
HtmlHelper.parseStyles(d.head().select("style")); HtmlSanitize.parseStyles(d.head().select("style"));
for (Element element : d.select("*")) { for (Element element : d.select("*")) {
String computed = HtmlHelper.processStyles(context, String computed = HtmlSanitize.processStyles(context,
element.tagName(), element.tagName(),
element.className(), element.className(),
element.attr("style"), element.attr("style"),

View File

@ -5924,11 +5924,11 @@ public class FragmentCompose extends FragmentBase {
Element e = d.body(); Element e = d.body();
// Apply styles // Apply styles
List<CSSStyleSheet> sheets = HtmlHelper.parseStyles(d.head().select("style")); List<CSSStyleSheet> sheets = HtmlSanitize.parseStyles(d.head().select("style"));
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 = HtmlSanitize.processStyles(context, tag, clazz, null, sheets);
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);

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff