From 0881c3f9d1e6209beb72c7e37db61c773e8e94bc Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 8 Oct 2019 19:54:52 +0200
Subject: [PATCH] Fit html message to width

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

diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index 00d8aaa0ed..a95ea087f8 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -1377,7 +1377,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 }
 
                 WebSettings settings = webView.getSettings();
-                settings.setUseWideViewPort(false);
+                settings.setUseWideViewPort(true);
                 settings.setLoadWithOverviewMode(true);
 
                 settings.setBuiltInZoomControls(true);
@@ -1399,8 +1399,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 settings.setBlockNetworkImage(!show_images);
                 settings.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW);
 
-                if (size != 0)
-                    webView.setInitialScale(Math.round(size * 100));
+                webView.setInitialScale(size == 0 ? 1 : Math.round(size * 100));
                 wvBody.setMinimumHeight(height);
                 if (position != null) {
                     wvBody.setScrollX(position.first);
@@ -1469,7 +1468,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                     args.putBoolean("has_images", has_images);
 
                     if (show_full) {
-                        HtmlHelper.removeViewportLimitations(document);
+                        HtmlHelper.setViewport(document);
                         if (inline || show_images)
                             HtmlHelper.embedInlineImages(context, message.id, document);
 
diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index d59a8ceb5a..825913e17a 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -565,23 +565,15 @@ public class HtmlHelper {
         }
     }
 
-    static void removeViewportLimitations(Document document) {
-        for (Element meta : document.select("meta").select("[name=viewport]")) {
-            String content = meta.attr("content");
-            String[] params = content.split(";");
-            if (params.length > 0) {
-                List<String> viewport = new ArrayList<>();
-                for (String param : params)
-                    if (!param.toLowerCase(Locale.ROOT).contains("maximum-scale") &&
-                            !param.toLowerCase(Locale.ROOT).contains("user-scalable"))
-                        viewport.add(param.trim());
-
-                if (viewport.size() == 0)
-                    meta.attr("content", "");
-                else
-                    meta.attr("content", TextUtils.join(" ;", viewport) + ";");
-            }
-        }
+    static void setViewport(Document document) {
+        // https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag
+        document.head().select("meta").select("[name=viewport]").remove();
+
+        document.head().prependChild(document.createElement("meta")
+                .attr("name", "viewport")
+                .attr("content", "width=device-width, initial-scale=1.0"));
+
+        Log.i(document.head().html());
     }
 
     static String getPreview(String body) {