diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-23 15:27:35 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-08-23 15:27:35 +0200 |
| commit | 88d7e46d6f6fe0498270cce492d65a487f2e4a3a (patch) | |
| tree | 7af5feb65cacbd12f915aff2b00b8216e6ff374f | |
| parent | 71657d993c7efe5e700e488d2b3e5235196cd412 (diff) | |
| parent | 9f9c31868de851b685f2fa06746a2fc2b59c0142 (diff) | |
| download | open-keychain-88d7e46d6f6fe0498270cce492d65a487f2e4a3a.tar.gz open-keychain-88d7e46d6f6fe0498270cce492d65a487f2e4a3a.tar.bz2 open-keychain-88d7e46d6f6fe0498270cce492d65a487f2e4a3a.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
| -rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java index ee312aedf..f6d993d6b 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperationTest.java @@ -500,6 +500,7 @@ public class PgpKeyOperationTest { modified = applyModificationWithChecks(parcel, modified, onlyA, onlyB); { + parcel.reset(); parcel.mChangeSubKeys.add(new SubkeyChange(keyId, null, expiry)); modified = applyModificationWithChecks(parcel, modified, onlyA, onlyB); |