aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-16 20:48:46 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-16 20:48:46 +0200
commit76465fc687f8dc1cfe9011f683fbe24ddc92005f (patch)
tree5e939b2e8ecb771ac651fad79d682f42d7b308b3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
parent01038d6a2640ce3c6327389798077bb4b35a6c9b (diff)
downloadopen-keychain-76465fc687f8dc1cfe9011f683fbe24ddc92005f.tar.gz
open-keychain-76465fc687f8dc1cfe9011f683fbe24ddc92005f.tar.bz2
open-keychain-76465fc687f8dc1cfe9011f683fbe24ddc92005f.zip
mime: add failure case if openpgp processing fails!
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java5
1 files changed, 5 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
index 99bd0ebef..b95a42b82 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
@@ -91,6 +91,11 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
}
log.addByMerge(decryptResult, 2);
+ if (!decryptResult.success()) {
+ log.add(LogType.MSG_DATA_ERROR_OPENPGP, 1);
+ return new InputDataResult(InputDataResult.RESULT_ERROR, log);
+ }
+
} else {
currentInputUri = input.getInputUri();
}