Fixed preformatted text

pull/178/head
M66B 5 years ago
parent 63ee1b1c99
commit 198612dac6

@ -5268,7 +5268,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
// Write decrypted body // Write decrypted body
String text = Helper.readText(plain); String text = Helper.readText(plain);
String html = HtmlHelper.formatPre(text); String html = "<pre>" + HtmlHelper.formatPre(text) + "</pre>";
Helper.writeText(message.getFile(context), html); Helper.writeText(message.getFile(context), html);
db.message().setMessageStored(message.id, new Date().getTime()); db.message().setMessageStored(message.id, new Date().getTime());
db.message().setMessageFts(message.id, false); db.message().setMessageFts(message.id, false);

@ -697,6 +697,7 @@ public class HtmlHelper {
// Pre formatted text // Pre formatted text
// https://developer.mozilla.org/en-US/docs/Web/HTML/Element/pre // https://developer.mozilla.org/en-US/docs/Web/HTML/Element/pre
if (!view)
for (Element pre : document.select("pre")) { for (Element pre : document.select("pre")) {
pre.html(formatPre(pre.wholeText())); pre.html(formatPre(pre.wholeText()));
pre.tagName("div"); pre.tagName("div");

@ -1589,7 +1589,7 @@ public class MessageHelper {
if (part.isMimeType("text/plain")) { if (part.isMimeType("text/plain")) {
if ("flowed".equalsIgnoreCase(ct.getParameter("format"))) if ("flowed".equalsIgnoreCase(ct.getParameter("format")))
result = HtmlHelper.flow(result); result = HtmlHelper.flow(result);
result = "<div>" + HtmlHelper.formatPre(result) + "</div>"; result = "<pre>" + HtmlHelper.formatPre(result) + "</pre>";
} else if (part.isMimeType("text/html")) { } else if (part.isMimeType("text/html")) {
if (TextUtils.isEmpty(charset)) { if (TextUtils.isEmpty(charset)) {
// <meta charset="utf-8" /> // <meta charset="utf-8" />

Loading…
Cancel
Save