From 6651b741eb740a28a5536bee32b2afa2c9d5bd13 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Fri, 7 Jan 2022 16:56:19 +0100
Subject: [PATCH] Fixed RTL support

---
 .../java/eu/faircode/email/HtmlHelper.java    | 51 ++++++++++++++-----
 1 file changed, 38 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/HtmlHelper.java b/app/src/main/java/eu/faircode/email/HtmlHelper.java
index 3ed13567ed..a0ce1e7bd4 100644
--- a/app/src/main/java/eu/faircode/email/HtmlHelper.java
+++ b/app/src/main/java/eu/faircode/email/HtmlHelper.java
@@ -1154,20 +1154,22 @@ public class HtmlHelper {
                         e.attr("x-line-after", "true");
                 }
             } else {
-                String style = e.attr("style");
-                e.attr("style",
-                        mergeStyles(style, "margin-top:0;margin-bottom:0"));
-
-                int ltr = 0;
-                int rtl = 0;
-                for (Element li : e.children()) {
-                    if ("rtl".equals(li.attr("dir")))
-                        rtl++;
-                    else
-                        ltr++;
-                    li.removeAttr("dir");
+                if (!BuildConfig.DEBUG) {
+                    String style = e.attr("style");
+                    e.attr("style",
+                            mergeStyles(style, "margin-top:0;margin-bottom:0"));
+
+                    int ltr = 0;
+                    int rtl = 0;
+                    for (Element li : e.children()) {
+                        if ("rtl".equals(li.attr("dir")))
+                            rtl++;
+                        else
+                            ltr++;
+                        li.removeAttr("dir");
+                    }
+                    e.attr("dir", rtl > ltr ? "rtl" : "ltr");
                 }
-                e.attr("dir", rtl > ltr ? "rtl" : "ltr");
             }
         }
 
@@ -3262,7 +3264,17 @@ public class HtmlHelper {
         String html = converter.toHtml(spanned, TO_HTML_PARAGRAPH_LINES_INDIVIDUAL);
 
         Document doc = JsoupEx.parse(html);
+
         for (Element span : doc.select("span")) {
+            if (span.attr("dir").equals("rtl")) {
+                Element next = span.nextElementSibling();
+                if (next != null && next.tagName().equals("br")) {
+                    span.tagName("div");
+                    span.appendElement("br");
+                    next.remove();
+                }
+            }
+
             String style = span.attr("style");
             if (TextUtils.isEmpty(style))
                 continue;
@@ -3306,6 +3318,19 @@ public class HtmlHelper {
             }
         }
 
+        for (Element e : doc.select("ol,ul")) {
+            int ltr = 0;
+            int rtl = 0;
+            for (Element li : e.children()) {
+                if ("rtl".equals(li.attr("dir")))
+                    rtl++;
+                else
+                    ltr++;
+                li.removeAttr("dir");
+            }
+            e.attr("dir", rtl > ltr ? "rtl" : "ltr");
+        }
+
         for (Element quote : doc.select("blockquote")) {
             Element prev = quote.previousElementSibling();
             if (prev != null && "br".equals(prev.tagName()))