msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Generate preview / detect language of encrypted messages

Browse Source
pull/194/head
M66B 5 years ago
parent 5ecb3fe03c
commit a8e2abb677
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File

44
app/src/main/java/eu/faircode/email/FragmentMessages.java
Unescape View File

@ -6215,16 +6215,29 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
MessageHelper helper = new MessageHelper(imessage, context); MessageHelper helper = new MessageHelper(imessage, context);
parts = helper.getMessageParts(); parts = helper.getMessageParts();
String subject = parts.getProtectedSubject(); String protect_subject = parts.getProtectedSubject();
if (subject != null)
db.message().setMessageSubject(message.id, subject); // Write decrypted body
String html = parts.getHtml(context);
Helper.writeText(message.getFile(context), html);
Log.i("pgp html=" + (html == null ? null : html.length()));
String text = HtmlHelper.getFullText(html);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, message.subject, text);
try { try {
db.beginTransaction(); db.beginTransaction();
// Write decrypted body if (protect_subject != null)
String html = parts.getHtml(context); db.message().setMessageSubject(message.id, protect_subject);
Helper.writeText(message.getFile(context), html);
db.message().setMessageContent(message.id,
true,
message.language,
parts.isPlainOnly(),
message.preview,
message.warning);
// Remove existing attachments // Remove existing attachments
db.attachment().deleteAttachments(message.id); db.attachment().deleteAttachments(message.id);
@ -6851,14 +6864,25 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
MessageHelper helper = new MessageHelper(imessage, context); MessageHelper helper = new MessageHelper(imessage, context);
MessageHelper.MessageParts parts = helper.getMessageParts(); MessageHelper.MessageParts parts = helper.getMessageParts();
// Write decrypted body
String html = parts.getHtml(context);
Helper.writeText(message.getFile(context), html);
Log.i("s/mime html=" + (html == null ? null : html.length()));
String text = HtmlHelper.getFullText(html);
message.preview = HtmlHelper.getPreview(text);
message.language = HtmlHelper.getLanguage(context, message.subject, text);
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try { try {
db.beginTransaction(); db.beginTransaction();
// Write decrypted body db.message().setMessageContent(message.id,
String html = parts.getHtml(context); true,
Helper.writeText(message.getFile(context), html); message.language,
Log.i("s/mime html=" + (html == null ? null : html.length())); parts.isPlainOnly(),
message.preview,
message.warning);
// Remove existing attachments // Remove existing attachments
db.attachment().deleteAttachments(message.id); db.attachment().deleteAttachments(message.id);

Write Preview
Loading…
Cancel
Save