From b7207e4217ea096d3187851249b20bb2582e9ed9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 5 Dec 2021 15:06:45 +0100
Subject: [PATCH] Auto link after sanitize

---
 .../main/java/eu/faircode/email/AdapterMessage.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 6bb266b941..763fa8497e 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2555,10 +2555,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                     HtmlHelper.cleanup(document);
                     HtmlHelper.removeRelativeLinks(document);
-                    HtmlHelper.autoLink(document);
-
-                    if (message.ui_found && found && !TextUtils.isEmpty(searched))
-                        HtmlHelper.highlightSearched(context, document, searched);
 
                     // Check for inline encryption
                     boolean iencrypted = HtmlHelper.contains(document, new String[]{
@@ -2608,6 +2604,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                                     .text(context.getString(R.string.title_truncated));
 
                         HtmlHelper.guessSchemes(document);
+                        HtmlHelper.autoLink(document);
+
+                        if (message.ui_found && found && !TextUtils.isEmpty(searched))
+                            HtmlHelper.highlightSearched(context, document, searched);
 
                         boolean overview_mode = prefs.getBoolean("overview_mode", false);
                         boolean override_width = prefs.getBoolean("override_width", false);
@@ -2637,6 +2637,11 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         // Cleanup message
                         document = HtmlHelper.sanitizeView(context, document, show_images);
 
+                        HtmlHelper.autoLink(document);
+
+                        if (message.ui_found && found && !TextUtils.isEmpty(searched))
+                            HtmlHelper.highlightSearched(context, document, searched);
+
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
                             args.putParcelable("actions", getConversationActions(message, document, context));