moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-23 18:02:15 -05:00
Code Issues Releases Wiki Activity

Don't attempt to verify/decrypt if no crypto provider is configured

Browse Source
This commit is contained in:
cketti 2015-02-06 23:26:46 +01:00
parent b515e947cf
commit 26eb1f52e5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
k9mail/src/main/java/com/fsck/k9/ui/messageview/MessageCryptoHelper.java
View File

@ -17,6 +17,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.IntentSender.SendIntentException; import android.content.IntentSender.SendIntentException;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.fsck.k9.Account; import com.fsck.k9.Account;
@ -73,6 +74,11 @@ public class MessageCryptoHelper {
public void decryptOrVerifyMessagePartsIfNecessary(LocalMessage message) { public void decryptOrVerifyMessagePartsIfNecessary(LocalMessage message) {
this.message = message; this.message = message;
if (!isCryptoProviderConfigured()) {
returnResultToFragment();
return;
}
List<Part> encryptedParts = MessageDecryptVerifier.findEncryptedParts(message); List<Part> encryptedParts = MessageDecryptVerifier.findEncryptedParts(message);
List<Part> signedParts = MessageDecryptVerifier.findSignedParts(message); List<Part> signedParts = MessageDecryptVerifier.findSignedParts(message);
List<Part> inlineParts = MessageDecryptVerifier.findPgpInlineParts(message); List<Part> inlineParts = MessageDecryptVerifier.findPgpInlineParts(message);
@ -87,6 +93,10 @@ public class MessageCryptoHelper {
} }
} }
private boolean isCryptoProviderConfigured() {
return !TextUtils.isEmpty(account.getCryptoApp());
}
private void decryptOrVerifyNextPartOrStartExtractingTextAndAttachments() { private void decryptOrVerifyNextPartOrStartExtractingTextAndAttachments() {
if (!partsToDecryptOrVerify.isEmpty()) { if (!partsToDecryptOrVerify.isEmpty()) {