diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 11:40:56 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-08 11:40:56 +0200 |
commit | cf8978b86d0a10494334789f70d1e348c60e63f0 (patch) | |
tree | eafc0ac41a084d639bae9bd0284959ccd2a2b52f | |
parent | f392d95ac34361ac9b38f9f39baf57500717e665 (diff) | |
download | open-keychain-cf8978b86d0a10494334789f70d1e348c60e63f0.tar.gz open-keychain-cf8978b86d0a10494334789f70d1e348c60e63f0.tar.bz2 open-keychain-cf8978b86d0a10494334789f70d1e348c60e63f0.zip |
Revert "Fix test"
This reverts commit f392d95ac34361ac9b38f9f39baf57500717e665.
-rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | 2 | ||||
-rw-r--r-- | settings.gradle | 1 |
2 files changed, 1 insertions, 2 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 96d56cb77..64152a040 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(), null, null); + modified = secretKey.certifyUserIds(publicRing, publicRing.getPublicKey().getUnorderedUserIds()); } { diff --git a/settings.gradle b/settings.gradle index 997dcc838..038e9da23 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,4 +15,3 @@ include ':extern:KeybaseLib:Lib' include ':extern:TokenAutoComplete:library' include ':extern:openpgp-card-nfc-lib:library' include ':extern:safeslinger-exchange' -include ':OpenKeychain-Test' |