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

Auto link before search highlighting

Browse source
This commit is contained in:
M66B 2021-11-27 15:28:38 +01:00
parent 180d270239
commit c64b7e78b7
4 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/eu/faircode/email/ActivityEML.java
View file

@ -270,6 +270,7 @@ public class ActivityEML extends ActivityBase {
String html = result.parts.getHtml(context); String html = result.parts.getHtml(context);
if (html != null) { if (html != null) {
Document parsed = JsoupEx.parse(html); Document parsed = JsoupEx.parse(html);
HtmlHelper.autoLink(parsed);
Document document = HtmlHelper.sanitizeView(context, parsed, false); Document document = HtmlHelper.sanitizeView(context, parsed, false);
result.body = HtmlHelper.fromDocument(context, document, null, null); result.body = HtmlHelper.fromDocument(context, document, null, null);
} }

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

@ -2549,6 +2549,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
HtmlHelper.cleanup(document); HtmlHelper.cleanup(document);
HtmlHelper.removeRelativeLinks(document); HtmlHelper.removeRelativeLinks(document);
HtmlHelper.autoLink(document);
if (message.ui_found && found && !TextUtils.isEmpty(searched)) if (message.ui_found && found && !TextUtils.isEmpty(searched))
HtmlHelper.highlightSearched(context, document, searched); HtmlHelper.highlightSearched(context, document, searched);
@ -2600,7 +2601,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.appendElement("em") .appendElement("em")
.text(context.getString(R.string.title_truncated)); .text(context.getString(R.string.title_truncated));
HtmlHelper.autoLink(document);
HtmlHelper.guessSchemes(document); HtmlHelper.guessSchemes(document);
boolean overview_mode = prefs.getBoolean("overview_mode", false); boolean overview_mode = prefs.getBoolean("overview_mode", false);

1
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -6275,6 +6275,7 @@ public class FragmentCompose extends FragmentBase {
Spanned spannedRef = null; Spanned spannedRef = null;
if (!ref.isEmpty()) { if (!ref.isEmpty()) {
Document dref = JsoupEx.parse(ref.outerHtml()); Document dref = JsoupEx.parse(ref.outerHtml());
HtmlHelper.autoLink(dref);
Document quote = HtmlHelper.sanitizeView(context, dref, show_images); Document quote = HtmlHelper.sanitizeView(context, dref, show_images);
spannedRef = HtmlHelper.fromDocument(context, quote, spannedRef = HtmlHelper.fromDocument(context, quote,
new Html.ImageGetter() { new Html.ImageGetter() {

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

@ -1241,10 +1241,6 @@ public class HtmlHelper {
} }
} }
// Autolink
if (view)
autoLink(document);
// Selective new lines // Selective new lines
for (Element div : document.select("div")) for (Element div : document.select("div"))
div.tagName("span"); div.tagName("span");