diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-05 14:37:09 +0300 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-05-05 14:37:09 +0300 |
| commit | da92e5f3767d59e2e6c2671d7df4aefe390cf5e2 (patch) | |
| tree | f5a1d9e3d94bb1067d24f7cf89de26430e091d77 /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | |
| parent | 6b7a0597af7aa42b375ca34d8a47515fa8adcc9f (diff) | |
| parent | eeb6fa5755c77f2e82b7b23a3cd98a17e09b6392 (diff) | |
| download | open-keychain-da92e5f3767d59e2e6c2671d7df4aefe390cf5e2.tar.gz open-keychain-da92e5f3767d59e2e6c2671d7df4aefe390cf5e2.tar.bz2 open-keychain-da92e5f3767d59e2e6c2671d7df4aefe390cf5e2.zip | |
Merge branch 'AlexFJW-StrippedChangePass'
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java')
| -rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java index df92547fe..de3ae2941 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringCanonicalizeTest.java @@ -58,11 +58,11 @@ import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.WorkaroundBuildConfig; import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; +import org.sufficientlysecure.keychain.service.ChangeUnlockParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; import org.sufficientlysecure.keychain.operations.results.OperationResult.LogType; import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog; -import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; import org.sufficientlysecure.keychain.service.input.CryptoInputParcel; import org.sufficientlysecure.keychain.support.KeyringTestingHelper; import org.sufficientlysecure.keychain.support.KeyringTestingHelper.RawPacket; @@ -117,7 +117,7 @@ public class UncachedKeyringCanonicalizeTest { } // passphrase is tested in PgpKeyOperationTest, just use empty here - parcel.mNewUnlock = new ChangeUnlockParcel(new Passphrase()); + parcel.setNewUnlock(new ChangeUnlockParcel(new Passphrase())); PgpKeyOperation op = new PgpKeyOperation(null); PgpEditKeyResult result = op.createSecretKeyRing(parcel); |