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

don't crash in onCryptoOperationCancelled if no part is being processed

Browse source
This commit is contained in:
Vincent Breitmoser 2016-12-28 17:40:20 +01:00
parent 2279526e0d
commit 17647a6fac
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoHelper.java
View file

@ -554,8 +554,12 @@ public class MessageCryptoHelper {
} }
private void onCryptoOperationCanceled() { private void onCryptoOperationCanceled() {
// there are weird states that get us here when we're not actually processing any part. just skip in that case
// see https://github.com/k9mail/k-9/issues/1878
if (currentCryptoPart != null) {
CryptoResultAnnotation errorPart = CryptoResultAnnotation.createOpenPgpCanceledAnnotation(); CryptoResultAnnotation errorPart = CryptoResultAnnotation.createOpenPgpCanceledAnnotation();
addCryptoResultAnnotationToMessage(errorPart); addCryptoResultAnnotationToMessage(errorPart);
}
onCryptoFinished(); onCryptoFinished();
} }
@ -579,8 +583,12 @@ public class MessageCryptoHelper {
} }
private void onCryptoFinished() { private void onCryptoFinished() {
currentCryptoPart = null; if (currentCryptoPart != null) {
partsToDecryptOrVerify.removeFirst(); partsToDecryptOrVerify.removeFirst();
currentCryptoPart = null;
} else {
Log.e(K9.LOG_TAG, "Got to onCryptoFinished() with no part in processing!", new Throwable());
}
decryptOrVerifyNextPart(); decryptOrVerifyNextPart();
} }