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

Workaround for Kerio Outlook Connector

Browse Source
This commit is contained in:
M66B
2025-10-02 21:56:13 +02:00
parent 5dd76576fb
commit 1eacdcca50
1 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5213,13 +5213,31 @@ public class MessageHelper {
// https://datatracker.ietf.org/doc/html/rfc2634#section-2
} else {
if (TextUtils.isEmpty(smimeType)) {
String name = ct.getParameter("name");
if ("smime.p7m".equalsIgnoreCase(name)) {
getMessageParts(null, part, parts, EntityAttachment.SMIME_MESSAGE);
return parts;
} else if ("smime.p7s".equalsIgnoreCase(name)) {
getMessageParts(null, part, parts, EntityAttachment.SMIME_SIGNED_DATA);
return parts;
String xmailer = imessage.getHeader("X-Mailer", null);
if (xmailer != null && xmailer.contains("Kerio Outlook Connector")) {
Object content = tryParseMultipart(Helper.readStream(part.getInputStream()), part.getContentType());
if (content instanceof Multipart) {
Multipart multipart = (Multipart) content;
int count = multipart.getCount();
for (int i = 0; i < count; i++)
try {
BodyPart child = multipart.getBodyPart(i);
getMessageParts(part, child, parts, null);
} catch (ParseException ex) {
Log.w(ex);
parts.warnings.add(Log.formatThrowable(ex, false));
}
return parts;
}
} else {
String name = ct.getParameter("name");
if ("smime.p7m".equalsIgnoreCase(name)) {
getMessageParts(null, part, parts, EntityAttachment.SMIME_MESSAGE);
return parts;
} else if ("smime.p7s".equalsIgnoreCase(name)) {
getMessageParts(null, part, parts, EntityAttachment.SMIME_SIGNED_DATA);
return parts;
}
}
}
StringBuilder sb = new StringBuilder();