wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix failing tests

Browse source
This commit is contained in:
cketti 2017-01-12 05:04:36 +01:00
parent da7ea43f77
commit 76b66472d4
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
k9mail/src/main/java/com/fsck/k9/crypto/MessageDecryptVerifier.java
View file

@ -70,6 +70,10 @@ public class MessageDecryptVerifier {
}
Multipart multipart = (Multipart) body;
if (multipart.getCount() == 0) {
return null;
}
BodyPart firstBodyPart = multipart.getBodyPart(0);
Part foundPart;
@ -92,6 +96,10 @@ public class MessageDecryptVerifier {
Body body = part.getBody();
if (part.isMimeType("multipart/alternative") && body instanceof Multipart) {
Multipart multipart = (Multipart) body;
if (multipart.getCount() == 0) {
return null;
}
BodyPart firstBodyPart = multipart.getBodyPart(0);
if (isPartPgpInlineEncryptedOrSigned(firstBodyPart)) {
return firstBodyPart;