aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
diff options
context:
space:
mode:
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java19
1 files changed, 12 insertions, 7 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
index ec0f68ced..7d9b2b9b3 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java
@@ -261,13 +261,18 @@ public class DecryptFileFragment extends DecryptFragment {
DecryptVerifyResult result =
returnData.getParcelable(KeychainIntentService.RESULT_DECRYPT_VERIFY_RESULT);
- switch (result.getResult()) {
- case DecryptVerifyResult.RESULT_PENDING_ASYM_PASSPHRASE:
- showPassphraseDialog(result.getKeyIdPassphraseNeeded());
- return;
- case DecryptVerifyResult.RESULT_PENDING_SYM_PASSPHRASE:
- showPassphraseDialog(Constants.key.symmetric);
- return;
+ if (result.isPending()) {
+ switch (result.getResult()) {
+ case DecryptVerifyResult.RESULT_PENDING_ASYM_PASSPHRASE:
+ showPassphraseDialog(result.getKeyIdPassphraseNeeded());
+ return;
+ case DecryptVerifyResult.RESULT_PENDING_SYM_PASSPHRASE:
+ showPassphraseDialog(Constants.key.symmetric);
+ return;
+ }
+ // error, we can't work with this!
+ result.createNotify(getActivity());
+ return;
}
// display signature result in activity