aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain-Test
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-08 11:40:56 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-08 11:40:56 +0200
commitcf8978b86d0a10494334789f70d1e348c60e63f0 (patch)
treeeafc0ac41a084d639bae9bd0284959ccd2a2b52f /OpenKeychain-Test
parentf392d95ac34361ac9b38f9f39baf57500717e665 (diff)
downloadopen-keychain-cf8978b86d0a10494334789f70d1e348c60e63f0.tar.gz
open-keychain-cf8978b86d0a10494334789f70d1e348c60e63f0.tar.bz2
open-keychain-cf8978b86d0a10494334789f70d1e348c60e63f0.zip
Revert "Fix test"
This reverts commit f392d95ac34361ac9b38f9f39baf57500717e665.
Diffstat (limited to 'OpenKeychain-Test')
-rw-r--r--OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java2
1 files changed, 1 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 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());
}
{