aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-15 23:22:12 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-15 23:22:12 +0200
commit81935fe99be8dc19852e184d5af1bb14f1430f98 (patch)
treefae86640bff5dc827ca41e4c9eaabd5cad01c601 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp
parent0cdcc909849a1a77dc4f7ad5123adce7648335bb (diff)
parentb6c7231a7f7db860059c3af803a5ddf04aa2cb9e (diff)
downloadopen-keychain-81935fe99be8dc19852e184d5af1bb14f1430f98.tar.gz
open-keychain-81935fe99be8dc19852e184d5af1bb14f1430f98.tar.bz2
open-keychain-81935fe99be8dc19852e184d5af1bb14f1430f98.zip
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java1
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index 7af7becb6..4f086c2a6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -102,7 +102,6 @@ public class PgpDecryptVerify extends BaseOperation {
// mandatory parameter
private Context mContext;
private ProviderHelper mProviderHelper;
- private PassphraseCacheInterface mPassphraseCache;
private InputData mData;
private OutputStream mOutStream;