|
|
@ -3568,14 +3568,7 @@ class Core {
|
|
|
|
|
|
|
|
|
|
|
|
boolean needsHeaders = EntityRule.needsHeaders(message, rules);
|
|
|
|
boolean needsHeaders = EntityRule.needsHeaders(message, rules);
|
|
|
|
List<Header> headers = (needsHeaders ? helper.getAllHeaders() : null);
|
|
|
|
List<Header> headers = (needsHeaders ? helper.getAllHeaders() : null);
|
|
|
|
String body;
|
|
|
|
String body = parts.getHtml(context, download_plain);
|
|
|
|
try {
|
|
|
|
|
|
|
|
body = parts.getHtml(context, download_plain);
|
|
|
|
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
|
|
|
|
Log.w(ex);
|
|
|
|
|
|
|
|
message.error = Log.formatThrowable(ex, false);
|
|
|
|
|
|
|
|
body = null;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
db.beginTransaction();
|
|
|
|
db.beginTransaction();
|
|
|
@ -3609,7 +3602,7 @@ class Core {
|
|
|
|
message.preview = HtmlHelper.getPreview(text);
|
|
|
|
message.preview = HtmlHelper.getPreview(text);
|
|
|
|
message.language = HtmlHelper.getLanguage(context, message.subject, text);
|
|
|
|
message.language = HtmlHelper.getLanguage(context, message.subject, text);
|
|
|
|
db.message().setMessageContent(message.id,
|
|
|
|
db.message().setMessageContent(message.id,
|
|
|
|
body != null,
|
|
|
|
true,
|
|
|
|
message.language,
|
|
|
|
message.language,
|
|
|
|
parts.isPlainOnly(download_plain),
|
|
|
|
parts.isPlainOnly(download_plain),
|
|
|
|
message.preview,
|
|
|
|
message.preview,
|
|
|
|