aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-04-29 21:24:15 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2016-04-29 21:24:15 +0200
commit120f71d791ade04b30957556916909939c1d0b05 (patch)
tree3f1197ab71277ad14a02a42dc6d3aefe42ea8fca /OpenKeychain/src/main/java
parent32f16ee7c3b57356e9073718460f9513747e8895 (diff)
parent38adb9c40ee2227e361ddbf773b219b512f2258f (diff)
downloadopen-keychain-120f71d791ade04b30957556916909939c1d0b05.tar.gz
open-keychain-120f71d791ade04b30957556916909939c1d0b05.tar.bz2
open-keychain-120f71d791ade04b30957556916909939c1d0b05.zip
Merge pull request #1832 from 007durgesh219/WrongCachedFileEncrypt
Fix Wrong file encrypted from cached input
Diffstat (limited to 'OpenKeychain/src/main/java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
index 22202a35f..d5c540856 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFilesFragment.java
@@ -729,6 +729,8 @@ public class EncryptFilesFragment
// make sure this is correct at this point
mAfterEncryptAction = AfterEncryptAction.SAVE;
cryptoOperation(new CryptoInputParcel(new Date()));
+ } else if (resultCode == Activity.RESULT_CANCELED) {
+ onCryptoOperationCancelled();
}
return;
}