Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-29 13:24:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

p=p support for incoming messages

Browse Source
This commit is contained in:
M66B
2021-03-02 13:52:52 +01:00
parent f188471b56
commit c17f6be444
2 changed files with 48 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
FAQ.md
View File

@@ -819,9 +819,8 @@ You can decode S/MIME signatures, etc, [here](https://lapo.it/asn1js/).
*pretty Easy privacy*
pretty Easy privacy (p≡p) is not supported
because there is still [no approved standard](https://tools.ietf.org/id/draft-birk-pep-00.html) for this
and because hardly anyone uses this.
There is still [no approved standard](https://tools.ietf.org/id/draft-birk-pep-00.html) for pretty Easy privacy (p≡p) and hardly anyone uses this.
Nevertheless, FairEmail can properly decode incoming p≡p messages since version 1.1519.
<br />

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

@@ -208,6 +208,7 @@ import java.util.concurrent.Future;
import javax.mail.Address;
import javax.mail.MessageRemovedException;
import javax.mail.MessagingException;
import javax.mail.Part;
import javax.mail.Session;
import javax.mail.internet.InternetAddress;
import javax.mail.internet.MimeMessage;
@@ -6244,6 +6245,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}
}
checkPep(message, remotes, context);
db.message().setMessageEncrypt(message.id, parts.getEncryption());
db.message().setMessageStored(message.id, new Date().getTime());
db.message().setMessageFts(message.id, false);
@@ -6875,6 +6878,8 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
Log.i("s/mime attachment=" + remote);
}
checkPep(message, remotes, context);
db.message().setMessageEncrypt(message.id, parts.getEncryption());
db.message().setMessageStored(message.id, new Date().getTime());
db.message().setMessageFts(message.id, false);
@@ -6916,6 +6921,47 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}.execute(this, args, "decrypt:s/mime");
}
private static void checkPep(EntityMessage message, List<EntityAttachment> remotes, Context context) throws IOException, MessagingException {
DB db = DB.getInstance(context);
for (EntityAttachment remote : remotes)
if ("message/rfc822".equals(remote.getMimeType())) {
Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null);
MimeMessage pep;
try (InputStream fis = new FileInputStream(remote.getFile(context))) {
pep = new MimeMessage(isession, fis);
}
String[] xpep = pep.getHeader("X-pEp-Wrapped-Message-Info");
if (xpep != null && xpep.length > 0 && "INNER".equals(xpep[0])) {
MessageHelper phelper = new MessageHelper(pep, context);
String spep = phelper.getSubject();
if (!TextUtils.isEmpty(spep))
db.message().setMessageSubject(message.id, spep);
String shtml = phelper.getMessageParts().getHtml(context);
if (!TextUtils.isEmpty(shtml)) {
String html = Helper.readText(message.getFile(context));
if (!TextUtils.isEmpty(html)) {
EntityAttachment a = new EntityAttachment();
a.message = message.id;
a.sequence = remotes.size();
a.type = "text/html";
a.disposition = Part.INLINE;
a.id = db.attachment().insertAttachment(a);
Helper.writeText(a.getFile(context), html);
db.attachment().setDownloaded(a.id, (long) html.length());
}
Helper.writeText(message.getFile(context), shtml);
}
}
}
}
private void onDelete(long id) {
Bundle args = new Bundle();
args.putLong("id", id);