aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
diff options
context:
space:
mode:
authorDurgesh <007durgesh219@gmail.com>2016-04-15 15:40:29 +0530
committerDurgesh <007durgesh219@gmail.com>2016-04-15 15:40:29 +0530
commit38adb9c40ee2227e361ddbf773b219b512f2258f (patch)
tree4812c65ce2378b6a638b30364ee59594b6635528 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui
parente08ae317970d2b46175eb7f72500061642e0b9b2 (diff)
downloadopen-keychain-38adb9c40ee2227e361ddbf773b219b512f2258f.tar.gz
open-keychain-38adb9c40ee2227e361ddbf773b219b512f2258f.tar.bz2
open-keychain-38adb9c40ee2227e361ddbf773b219b512f2258f.zip
Fix Wrong file encrypted from cached input
Signed-off-by: Durgesh <007durgesh219@gmail.com>
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')
-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;
}