Decrypt subject improvement

pull/187/head
M66B 5 years ago
parent b49e9292e6
commit 574455b18a

@ -5975,10 +5975,16 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
// https://github.com/autocrypt/protected-headers // https://github.com/autocrypt/protected-headers
try { try {
Object content = imessage.getContent(); Object content = imessage.getContent();
BodyPart bp = null;
if (content instanceof MimeMultipart) { if (content instanceof MimeMultipart) {
MimeMultipart mmp = (MimeMultipart) content; MimeMultipart mmp = (MimeMultipart) content;
if (mmp.getCount() > 0) { if (mmp.getCount() > 0)
BodyPart bp = mmp.getBodyPart(0); bp = mmp.getBodyPart(0);
} else if (content instanceof BodyPart)
bp = (BodyPart) content;
if (bp != null) {
ContentType ct = new ContentType(bp.getContentType()); ContentType ct = new ContentType(bp.getContentType());
if ("v1".equals(ct.getParameter("protected-headers"))) { if ("v1".equals(ct.getParameter("protected-headers"))) {
String[] subject = bp.getHeader("subject"); String[] subject = bp.getHeader("subject");
@ -5986,7 +5992,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
db.message().setMessageSubject(message.id, subject[0]); db.message().setMessageSubject(message.id, subject[0]);
} }
} }
}
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); Log.e(ex);
} }

Loading…
Cancel
Save