aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-08 00:01:29 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-08 00:01:29 +0200
commit83af19de20cbfa8fe99216f4dcb8af8819570147 (patch)
tree7f4b29d6aecc8b9627058a1d24e2125f18afa824 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
parentfd7f1873641031b9dece88db0cf0dd18a94830a5 (diff)
downloadopen-keychain-83af19de20cbfa8fe99216f4dcb8af8819570147.tar.gz
open-keychain-83af19de20cbfa8fe99216f4dcb8af8819570147.tar.bz2
open-keychain-83af19de20cbfa8fe99216f4dcb8af8819570147.zip
Prepare Yubikey decryption
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
index a5b672e7e..b9746aee5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
@@ -697,7 +697,8 @@ public class KeychainIntentService extends IntentService implements Progressable
if (!certificationKey.unlock(signaturePassphrase)) {
throw new PgpGeneralException("Error extracting key (bad passphrase?)");
}
- UncachedKeyRing newRing = certificationKey.certifyUserIds(publicRing, userIds);
+ // TODO: supply nfc stuff
+ UncachedKeyRing newRing = certificationKey.certifyUserIds(publicRing, userIds, null, null);
// store the signed key in our local cache
providerHelper.savePublicKeyRing(newRing);