diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 11:40:06 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 11:40:06 +0200 |
| commit | f392d95ac34361ac9b38f9f39baf57500717e665 (patch) | |
| tree | cdeadc495494227f6031201158f54c2e41b9179d | |
| parent | 8ab2491645fb34677ee4bdbb9b8302f242419844 (diff) | |
| download | open-keychain-f392d95ac34361ac9b38f9f39baf57500717e665.tar.gz open-keychain-f392d95ac34361ac9b38f9f39baf57500717e665.tar.bz2 open-keychain-f392d95ac34361ac9b38f9f39baf57500717e665.zip | |
Fix test
| -rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | 2 | ||||
| -rw-r--r-- | settings.gradle | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java index 64152a040..96d56cb77 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java @@ -281,7 +281,7 @@ public class UncachedKeyringMergeTest { ringB.getEncoded(), false, 0).getSecretKey(); secretKey.unlock(""); // sign all user ids - modified = secretKey.certifyUserIds(publicRing, publicRing.getPublicKey().getUnorderedUserIds()); + modified = secretKey.certifyUserIds(publicRing, publicRing.getPublicKey().getUnorderedUserIds(), null, null); } { diff --git a/settings.gradle b/settings.gradle index 038e9da23..997dcc838 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,3 +15,4 @@ include ':extern:KeybaseLib:Lib' include ':extern:TokenAutoComplete:library' include ':extern:openpgp-card-nfc-lib:library' include ':extern:safeslinger-exchange' +include ':OpenKeychain-Test' |