diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 14:10:45 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 14:10:45 +0200 |
commit | 9eb65601c4092bddf8de96b652140ae37e494e6f (patch) | |
tree | 63f6ef1fe54c335578577ab73e511f519c6ae03a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java | |
parent | 11b9ed2b741c03e682335ee7d8b785535430feaf (diff) | |
download | open-keychain-9eb65601c4092bddf8de96b652140ae37e494e6f.tar.gz open-keychain-9eb65601c4092bddf8de96b652140ae37e494e6f.tar.bz2 open-keychain-9eb65601c4092bddf8de96b652140ae37e494e6f.zip |
Revert changes in DecryptFileFragment
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java index ee1460ee3..845fbfa3b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java @@ -33,15 +33,12 @@ import android.view.ViewGroup; import android.widget.CheckBox; import android.widget.TextView; -import org.openintents.openpgp.util.OpenPgpApi; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.helper.FileHelper; -import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyResult; import org.sufficientlysecure.keychain.service.KeychainIntentService; import org.sufficientlysecure.keychain.service.KeychainIntentServiceHandler; -import org.sufficientlysecure.keychain.service.PassphraseCacheService; import org.sufficientlysecure.keychain.ui.dialog.DeleteFileDialogFragment; import org.sufficientlysecure.keychain.ui.dialog.PassphraseDialogFragment; import org.sufficientlysecure.keychain.util.Log; @@ -185,20 +182,7 @@ public class DecryptFileFragment extends DecryptFragment { returnData.getParcelable(KeychainIntentService.RESULT_DECRYPT_VERIFY_RESULT); if (PgpDecryptVerifyResult.KEY_PASSHRASE_NEEDED == decryptVerifyResult.getStatus()) { - try { - // try to get passphrase from cache... - String passphrase = PassphraseCacheService.getCachedPassphrase( - getActivity(), decryptVerifyResult.getKeyIdPassphraseNeeded()); - - if (passphrase != null) { - // try again with passphrase from cache - decryptOriginalFilename(passphrase); - } else { - showPassphraseDialogForFilename(decryptVerifyResult.getKeyIdPassphraseNeeded()); - } - } catch (PassphraseCacheService.KeyNotFoundException e) { - Log.e(Constants.TAG, "PassphraseCacheService.KeyNotFoundException", e); - } + showPassphraseDialogForFilename(decryptVerifyResult.getKeyIdPassphraseNeeded()); } else if (PgpDecryptVerifyResult.SYMMETRIC_PASSHRASE_NEEDED == decryptVerifyResult.getStatus()) { showPassphraseDialogForFilename(Constants.key.symmetric); |