mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added S/MIME fallback

This commit is contained in:
M66B 2021-02-03 18:02:07 +01:00
parent f90e06c50e
commit 824d3b3b3f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2370,13 +2370,16 @@ public class MessageHelper {
part.isMimeType("application/x-pkcs7-mime")) {
ContentType ct = new ContentType(part.getContentType());
String smimeType = ct.getParameter("smime-type");
if ("enveloped-data".equals(smimeType)) {
if ("enveloped-data".equalsIgnoreCase(smimeType) ||
"smime.p7m".equalsIgnoreCase(ct.getParameter("name"))) {
getMessageParts(part, parts, EntityAttachment.SMIME_MESSAGE);
return parts;
} else if ("signed-data".equals(smimeType)) {
} else if ("signed-data".equalsIgnoreCase(smimeType) ||
"smime.p7s".equalsIgnoreCase(ct.getParameter("name"))) {
getMessageParts(part, parts, EntityAttachment.SMIME_SIGNED_DATA);
return parts;
}
} else
Log.e(ct.toString());
}
} catch (ParseException ex) {
Log.w(ex);