Download HTML if no plain part

4 years ago · 9c390f0f55
parent 74cb32ea3c
commit 9c390f0f55
1 changed files with 6 additions and 2 deletions
--- a/app/src/main/java/eu/faircode/email/MessageHelper.java
+++ b/app/src/main/java/eu/faircode/email/MessageHelper.java
@ -2877,16 +2877,20 @@ public class MessageHelper {

            Integer plain = isPlainOnly();
            if (plain != null && (plain & 1) != 0)
+                // Plain only
                parts.addAll(text);
-            else
+            else {
+                // Either plain and HTML or HTML only
+                boolean hasPlain = (plain != null && (plain & 0x80) != 0);
                for (PartHolder h : text)
-                    if (plain_text) {
+                    if (plain_text && hasPlain) {
                        if (h.isPlainText())
                            parts.add(h);
                    } else {
                        if (h.isHtml())
                            parts.add(h);
                    }
+            }

            parts.addAll(extra);