From cf64335cb4ded8718f59eea7093b4b851646b754 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 10 Feb 2020 18:03:25 +0100
Subject: [PATCH] Never more

---
 .../java/eu/faircode/email/AdapterMessage.java | 12 +++++++-----
 .../java/eu/faircode/email/HtmlHelper.java     | 18 ++++++++++++++++++
 app/src/main/res/values/strings.xml            |  2 +-
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a8db572ac3..d14d6c61ac 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -247,8 +247,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
     private static final ExecutorService precompute =
             Helper.getBackgroundExecutor(1, "precompute");
 
-    private static final int LARGE_MESSAGE_SIZE = 250 * 1024;
-
     // https://github.com/newhouse/url-tracking-stripper
     private static final List<String> PARANOID_QUERY = Collections.unmodifiableList(Arrays.asList(
             // https://en.wikipedia.org/wiki/UTM_parameters
@@ -1749,9 +1747,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
 
                         return document.html();
                     } else {
-                        if (body.length() > LARGE_MESSAGE_SIZE)
-                            return HtmlHelper.fromHtml("<em>" + context.getString(R.string.title_too_large) + "</em>");
-
                         // Cleanup message
                         document = HtmlHelper.sanitize(context, body, show_images, true);
 
@@ -3495,6 +3490,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     Log.unexpectedError(parentFragment.getParentFragmentManager(), ex);
                 }
             } else {
+                if ("more".equals(uri.getScheme())) {
+                    TupleMessageEx message = getMessage();
+                    if (message != null)
+                        onShow(message, true);
+                    return (message != null);
+                }
+
                 if ("cid".equals(uri.getScheme()) || "data".equals(uri.getScheme()))
                     return false;
 
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index dd94ec6647..1965788a8d 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -77,6 +77,7 @@ public class HtmlHelper {
     private static final float MIN_LUMINANCE = 0.5f;
     private static final int TAB_SIZE = 2;
     private static final int MAX_AUTO_LINK = 250;
+    private static final int MAX_TEXT_SIZE = 50 * 1024; // characters
     private static final int TRACKING_PIXEL_SURFACE = 25; // pixels
 
     private static final List<String> heads = Collections.unmodifiableList(Arrays.asList(
@@ -714,11 +715,28 @@ public class HtmlHelper {
                 if (!TextUtils.isEmpty(span.attr("color")))
                     span.tagName("font");
 
+        int length = 0;
+        for (Element elm : document.select("*")) {
+            for (Node child : elm.childNodes())
+                if (child instanceof TextNode)
+                    length += ((TextNode) child).text().length();
+            if (length > MAX_TEXT_SIZE)
+                elm.remove();
+        }
+
         if (document.body() == null) {
             Log.e("Sanitize without body");
             document.normalise();
         }
 
+        if (length > MAX_TEXT_SIZE)
+            document.body()
+                    .appendElement("p")
+                    .appendElement("big")
+                    .appendElement("a")
+                    .attr("href", "more:")
+                    .text(context.getString(R.string.title_show_more));
+
         return document;
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 62e02484fc..dc0c24e0d0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -694,7 +694,7 @@
     <string name="title_no_format">The originally received message will be included</string>
     <string name="title_no_image">Image could not be decoded</string>
     <string name="title_no_search">Search on server is not available for this account</string>
-    <string name="title_too_large">Message too large to reformat, try to use the original message view via the full screen icon instead</string>
+    <string name="title_show_more">Show more &#8230;</string>
     <string name="title_unused_inline">Unused inline images will be removed on send</string>
     <string name="title_accross_remark">Messages moved across accounts will be downloaded again resulting in extra data usage</string>
     <string name="title_raw_saved">Raw message saved</string>