From da0fc61ace28c5e77d2818237a76ca4d9158d595 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 3 Aug 2024 19:40:35 +0200
Subject: [PATCH] Revert "Skip replacing meta/viewport"

This reverts commit 6c460eef23ffefac936194724c1d7349d2c39259.
---
 .../java/eu/faircode/email/HtmlHelper.java    | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 6a586d39e8..431a36910d 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -2481,39 +2481,43 @@ public class HtmlHelper {
         // https://developer.mozilla.org/en-US/docs/Mozilla/Mobile/Viewport_meta_tag
         // https://drafts.csswg.org/css-device-adapt/#viewport-meta
         Elements meta = document.select("meta").select("[name=viewport]");
-        if (meta.size() != 1)
-            return;
-
         // Note that the browser will recognize meta elements in the body too
         if (overview) {
             // fit width
-            //meta.remove();
-            //document.head().prependElement("meta")
-            //        .attr("name", "viewport")
-            //        .attr("content", "width=device-width");
+            meta.remove();
+            document.head().prependElement("meta")
+                    .attr("name", "viewport")
+                    .attr("content", "width=device-width");
         } else {
-            String content = meta.attr("content");
-            String[] param = content.split("[;,]");
-            for (int i = 0; i < param.length; i++) {
-                String[] kv = param[i].split("=");
-                if (kv.length == 2) {
-                    String key = kv[0]
-                            .replaceAll("\\s+", "")
-                            .toLowerCase(Locale.ROOT);
-                    switch (key) {
-                        case "user-scalable":
-                            kv[1] = "yes";
-                            param[i] = TextUtils.join("=", kv);
-                            break;
-                        case "minimum-scale":
-                        case "maximum-scale":
-                            kv[0] = "disabled-scaling";
-                            param[i] = TextUtils.join("=", kv);
-                            break;
+            if (meta.size() == 1) {
+                String content = meta.attr("content");
+                String[] param = content.split("[;,]");
+                for (int i = 0; i < param.length; i++) {
+                    String[] kv = param[i].split("=");
+                    if (kv.length == 2) {
+                        String key = kv[0]
+                                .replaceAll("\\s+", "")
+                                .toLowerCase(Locale.ROOT);
+                        switch (key) {
+                            case "user-scalable":
+                                kv[1] = "yes";
+                                param[i] = TextUtils.join("=", kv);
+                                break;
+                            case "minimum-scale":
+                            case "maximum-scale":
+                                kv[0] = "disabled-scaling";
+                                param[i] = TextUtils.join("=", kv);
+                                break;
+                        }
                     }
                 }
+                meta.attr("content", TextUtils.join(",", param));
+            } else {
+                meta.remove();
+                document.head().prependElement("meta")
+                        .attr("name", "viewport")
+                        .attr("content", "width=device-width, initial-scale=1.0");
             }
-            meta.attr("content", TextUtils.join(",", param));
         }
 
         if (BuildConfig.DEBUG)