aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-24 01:46:54 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-24 01:46:54 +0200
commit3850ddea084ae53e3f14a839ede0209ca7f0e451 (patch)
tree13274f2e205573215925c5664db5418b33844b81 /OpenKeychain
parent6e0938aa9300b3bc8fa5b9c8cfd9c52a97c78506 (diff)
downloadopen-keychain-3850ddea084ae53e3f14a839ede0209ca7f0e451.tar.gz
open-keychain-3850ddea084ae53e3f14a839ede0209ca7f0e451.tar.bz2
open-keychain-3850ddea084ae53e3f14a839ede0209ca7f0e451.zip
DecryptFiles: Reset state for new file decrytion
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java4
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
index 0ace8e82a..6a2fe6f14 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFilesFragment.java
@@ -88,6 +88,9 @@ public class DecryptFilesFragment extends DecryptFragment {
mDecryptButton = view.findViewById(R.id.decrypt_file_action_decrypt);
view.findViewById(R.id.decrypt_file_browse).setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
+ // reset state
+ mPassphrase = null;
+ mNfcDecryptedSessionKey = null;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
FileHelper.openDocument(DecryptFilesFragment.this, "*/*", REQUEST_CODE_INPUT);
} else {
@@ -139,7 +142,6 @@ public class DecryptFilesFragment extends DecryptFragment {
return;
}
-// askForOutputFilename();
decryptOriginalFilename();
}