Removed pEp support

Doesn't exist anymore
pull/217/head
M66B 5 months ago
parent a765735850
commit 0f85aef12a

@ -9947,11 +9947,9 @@ public class FragmentMessages extends FragmentBase
} }
} }
boolean pep = checkPep(message, remotes, context);
encrypt = parts.getEncryption(); encrypt = parts.getEncryption();
db.message().setMessageEncrypt(message.id, encrypt); db.message().setMessageEncrypt(message.id, encrypt);
db.message().setMessageRevision(message.id, pep || protect_subject == null ? 1 : -1); db.message().setMessageRevision(message.id, protect_subject == null ? 1 : -1);
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);
@ -10754,11 +10752,9 @@ public class FragmentMessages extends FragmentBase
} }
} }
boolean pep = checkPep(message, remotes, context);
db.message().setMessageEncrypt(message.id, db.message().setMessageEncrypt(message.id,
signedData ? EntityMessage.SMIME_SIGNONLY : parts.getEncryption()); signedData ? EntityMessage.SMIME_SIGNONLY : parts.getEncryption());
db.message().setMessageRevision(message.id, pep || protect_subject == null ? 1 : -1); db.message().setMessageRevision(message.id, protect_subject == null ? 1 : -1);
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);
@ -10800,51 +10796,6 @@ public class FragmentMessages extends FragmentBase
}.serial().execute(this, args, "decrypt:s/mime"); }.serial().execute(this, args, "decrypt:s/mime");
} }
private static boolean checkPep(EntityMessage message, List<EntityAttachment> remotes, Context context) {
DB db = DB.getInstance(context);
for (EntityAttachment remote : remotes)
if ("message/rfc822".equals(remote.getMimeType()))
try {
Properties props = MessageHelper.getSessionProperties(true);
Session isession = Session.getInstance(props, null);
MimeMessage imessage;
try (InputStream fis = new FileInputStream(remote.getFile(context))) {
imessage = new MimeMessage(isession, fis);
}
String[] xpep = imessage.getHeader("X-pEp-Wrapped-Message-Info");
if (xpep == null || xpep.length == 0 || !"INNER".equalsIgnoreCase(xpep[0]))
continue;
MessageHelper helper = new MessageHelper(imessage, context);
String subject = helper.getSubject();
String html = helper.getMessageParts().getHtml(context);
if (!TextUtils.isEmpty(html))
Helper.writeText(message.getFile(context), html);
try {
db.beginTransaction();
if (!TextUtils.isEmpty(subject))
db.message().setMessageSubject(message.id, subject);
// Prevent showing the embedded message
db.attachment().setType(remote.id, "application/octet-stream");
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
return true;
} catch (Throwable ex) {
Log.e(ex);
}
return false;
}
private void onDelete(long id) { private void onDelete(long id) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", id); args.putLong("id", id);

Loading…
Cancel
Save