diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-29 23:17:01 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-12-29 23:17:01 +0100 |
| commit | ccde6add70ea9b5c559910d42dfb2e0bf79f5989 (patch) | |
| tree | b2178874da7f9f36597097959de135a808e1e7a5 /OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | |
| parent | 610c4780f13cbfb0f85eb74ee8c6bed4f18eb70a (diff) | |
| parent | 576e6fd0cca41691a52db8e1325508f00a6e9bc6 (diff) | |
| download | open-keychain-ccde6add70ea9b5c559910d42dfb2e0bf79f5989.tar.gz open-keychain-ccde6add70ea9b5c559910d42dfb2e0bf79f5989.tar.bz2 open-keychain-ccde6add70ea9b5c559910d42dfb2e0bf79f5989.zip | |
Merge branch 'development' of github.com:open-keychain/open-keychain into development
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java')
| -rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java index a4b6edac8..cbdbd0e72 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java @@ -104,7 +104,7 @@ public class UncachedKeyringCanonicalizeTest { parcel.mAddUserIds.add("twi"); parcel.mAddUserIds.add("pink"); // passphrase is tested in PgpKeyOperationTest, just use empty here - parcel.mNewPassphrase = ""; + parcel.mNewUnlock = ""; PgpKeyOperation op = new PgpKeyOperation(null); EditKeyResult result = op.createSecretKeyRing(parcel); |