aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
index cc2eda3bc..d6865f8ea 100644
--- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
+++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java
@@ -264,10 +264,19 @@ public class PgpEncryptDecryptTest {
}
@Override
- public String getCachedPassphrase(long masterKeyId) throws NoSecretKeyException {
+ public String getCachedPassphrase(long masterKeyId, long subKeyId) throws NoSecretKeyException {
if (mExpectedId != null){
Assert.assertEquals("requested passphrase must be for expected id",
- (long) mExpectedId, masterKeyId);
+ (long) mExpectedId, subKeyId);
+ }
+ return mPassphrase;
+ }
+
+ @Override
+ public String getCachedPassphrase(long subKeyId) throws NoSecretKeyException {
+ if (mExpectedId != null){
+ Assert.assertEquals("requested passphrase must be for expected id",
+ (long) mExpectedId, subKeyId);
}
return mPassphrase;
}