From 10ae87d7cd3cbd501f7d4c732f4bd3d20eacad56 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 14 Feb 2020 09:41:28 +0100
Subject: [PATCH] Conditionally more

---
 .../eu/faircode/email/AdapterMessage.java     |  2 +-
 .../java/eu/faircode/email/HtmlHelper.java    | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 18683aabe2..864b7772fb 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1753,7 +1753,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                         return document.html();
                     } else {
                         // Cleanup message
-                        document = HtmlHelper.sanitize(context, body, show_images, true);
+                        document = HtmlHelper.sanitize(context, body, show_images, true, true);
 
                         // Collapse quotes
                         if (!show_quotes) {
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 6f93a47869..b29c83c852 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -238,8 +238,12 @@ public class HtmlHelper {
     }
 
     static Document sanitize(Context context, String html, boolean show_images, boolean autolink) {
+        return sanitize(context, html, show_images, autolink, false);
+    }
+
+    static Document sanitize(Context context, String html, boolean show_images, boolean autolink, boolean more) {
         try {
-            return _sanitize(context, html, show_images, autolink);
+            return _sanitize(context, html, show_images, autolink, more);
         } catch (Throwable ex) {
             // OutOfMemoryError
             Log.e(ex);
@@ -251,7 +255,7 @@ public class HtmlHelper {
         }
     }
 
-    private static Document _sanitize(Context context, String html, boolean show_images, boolean autolink) {
+    private static Document _sanitize(Context context, String html, boolean show_images, boolean autolink, boolean more) {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
         boolean text_color = prefs.getBoolean("text_color", true);
         boolean display_hidden = prefs.getBoolean("display_hidden", false);
@@ -339,12 +343,13 @@ public class HtmlHelper {
                     .appendElement("em")
                     .text(context.getString(R.string.title_too_large));
 
-            parsed.body()
-                    .appendElement("p")
-                    .appendElement("big")
-                    .appendElement("a")
-                    .attr("href", "full:")
-                    .text(context.getString(R.string.title_show_full));
+            if (more)
+                parsed.body()
+                        .appendElement("p")
+                        .appendElement("big")
+                        .appendElement("a")
+                        .attr("href", "full:")
+                        .text(context.getString(R.string.title_show_full));
         }
 
         Whitelist whitelist = Whitelist.relaxed()