aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-11-15 01:01:05 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-11-15 01:01:09 +0100
commit529b9518c12208f281af15945d06389050abd887 (patch)
tree3fbe63063ae4187d9343287fce149a4848658a89 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
parentba2c5c3bd0a2c4b6c7f0f0af74a6fd22e6213c4a (diff)
downloadopen-keychain-529b9518c12208f281af15945d06389050abd887.tar.gz
open-keychain-529b9518c12208f281af15945d06389050abd887.tar.bz2
open-keychain-529b9518c12208f281af15945d06389050abd887.zip
decrypt: skip all encountered marker packets (fix #1582)
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, 2 insertions, 3 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 d3f4cd2f3..bb8d6ad73 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/InputDataOperation.java
@@ -110,10 +110,9 @@ public class InputDataOperation extends BaseOperation<InputDataParcel> {
if (decryptResult.isPending()) {
return new InputDataResult(log, decryptResult);
}
- log.addByMerge(decryptResult, 2);
+ log.addByMerge(decryptResult, 1);
- if (!decryptResult.success()) {
- log.add(LogType.MSG_DATA_ERROR_OPENPGP, 1);
+ if ( ! decryptResult.success()) {
return new InputDataResult(InputDataResult.RESULT_ERROR, log);
}