mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-03-03 10:16:45 +00:00
Code Issues Releases Wiki Activity

Refactoring

Browse source
This commit is contained in:
M66B 2021-12-04 14:10:11 +01:00
parent 5a42134be8
commit 2e34d144a2
2 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/eu/faircode/email/AdapterMessage.java
View file

@ -2612,8 +2612,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean overview_mode = prefs.getBoolean("overview_mode", false);
boolean override_width = prefs.getBoolean("override_width", false);
HtmlHelper.setViewport(document, overview_mode);
if (!overview_mode && override_width)
HtmlHelper.overrideWidth(document);
HtmlHelper.overrideWidth(document, overview_mode);
if (inline || show_images)
HtmlHelper.embedInlineImages(context, message.id, document, show_images);
@ -5545,8 +5544,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
boolean overview_mode = prefs.getBoolean("overview_mode", false);
boolean override_width = prefs.getBoolean("override_width", false);
HtmlHelper.setViewport(d, overview_mode);
if (!overview_mode && override_width)
HtmlHelper.overrideWidth(d);
if (override_width)
HtmlHelper.overrideWidth(d, overview_mode);
}
List<CSSStyleSheet> sheets =

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

@ -2064,21 +2064,23 @@ public class HtmlHelper {
Log.i(document.head().html());
}
static void overrideWidth(Document document) {
for (Element e : document.select("*")) {
String width = e.attr("width");
if (TextUtils.isEmpty(width))
continue;
e.attr("style", mergeStyles(
e.attr("style"),
"width: " + width));
e.removeAttr("width");
}
static void overrideWidth(Document document, boolean overview_mode) {
if (!overview_mode) {
for (Element e : document.select("*")) {
String width = e.attr("width");
if (TextUtils.isEmpty(width))
continue;
e.attr("style", mergeStyles(
e.attr("style"),
"width: " + width));
e.removeAttr("width");
}
for (Element e : document.body().children())
e.attr("style", mergeStyles(
e.attr("style"),
"min-width: 0 !important; max-width: 100% !important;"));
for (Element e : document.body().children())
e.attr("style", mergeStyles(
e.attr("style"),
"min-width: 0 !important; max-width: 100% !important;"));
}
}
static String getLanguage(Context context, String subject, String text) {