mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-01-01 12:44:42 +00:00
Code Issues Releases Wiki Activity

Prevent crash

Browse source
This commit is contained in:
M66B 2020-05-28 08:43:47 +02:00
parent be6cb71fb2
commit f5f56279b0
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -1871,14 +1871,18 @@ public class MessageHelper {
MimePart part = imessage; MimePart part = imessage;
if (part.isMimeType("multipart/mixed")) { if (part.isMimeType("multipart/mixed")) {
Multipart mp = (Multipart) part.getContent(); Object content = part.getContent();
for (int i = 0; i < mp.getCount(); i++) { if (content instanceof Multipart) {
BodyPart bp = mp.getBodyPart(i); Multipart mp = (Multipart) content;
if (bp.isMimeType("multipart/signed") || bp.isMimeType("multipart/encrypted")) { for (int i = 0; i < mp.getCount(); i++) {
part = (MimePart) bp; BodyPart bp = mp.getBodyPart(i);
break; if (bp.isMimeType("multipart/signed") || bp.isMimeType("multipart/encrypted")) {
part = (MimePart) bp;
break;
}
} }
} } else
Log.e("Mixed type=" + (content == null ? null : content.getClass().getName()));
} }
if (part.isMimeType("multipart/signed")) { if (part.isMimeType("multipart/signed")) {