Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-20 11:40:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added PGP subject encryption

Browse Source
This commit is contained in:
M66B
2020-11-18 12:01:19 +01:00
parent eb8c715972
commit fc8ae3efc5
5 changed files with 81 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -169,6 +169,7 @@ public class MessageHelper {
boolean hide_timezone = prefs.getBoolean("hide_timezone", true);
boolean autocrypt = prefs.getBoolean("autocrypt", true);
boolean mutual = prefs.getBoolean("autocrypt_mutual", true);
boolean encrypt_subject = prefs.getBoolean("encrypt_subject", false);
MimeMessageEx imessage = new MimeMessageEx(isession, message.msgid);
@@ -401,6 +402,9 @@ public class MessageHelper {
multipart.addBodyPart(bpContent);
imessage.setContent(multipart);
if (encrypt_subject)
imessage.setSubject("...");
return imessage;
} else if (EntityAttachment.SMIME_SIGNATURE.equals(attachment.encryption)) {
Log.i("Sending S/MIME signed message");
@@ -1636,11 +1640,16 @@ public class MessageHelper {
}
class MessageParts {
private String protected_subject;
private List<PartHolder> text = new ArrayList<>();
private List<PartHolder> extra = new ArrayList<>();
private List<AttachmentPart> attachments = new ArrayList<>();
private ArrayList<String> warnings = new ArrayList<>();
String getProtectedSubject() {
return protected_subject;
}
Boolean isPlainOnly() {
if (text.size() + extra.size() == 0)
return null;
@@ -2299,6 +2308,19 @@ public class MessageHelper {
private void getMessageParts(Part part, MessageParts parts, Integer encrypt) throws IOException, MessagingException {
try {
Log.d("Part class=" + part.getClass() + " type=" + part.getContentType());
// https://github.com/autocrypt/protected-headers
try {
ContentType ct = new ContentType(part.getContentType());
if ("v1".equals(ct.getParameter("protected-headers"))) {
String[] subject = part.getHeader("subject");
if (subject != null && subject.length != 0)
parts.protected_subject = subject[0];
}
} catch (Throwable ex) {
Log.e(ex);
}
if (part.isMimeType("multipart/*")) {
Multipart multipart;
Object content = part.getContent();