From ba018d1f1ba1942188cab81952cae2b4b8fb33b7 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 4 Oct 2014 15:13:38 +0200 Subject: yubikey: check with correct subkey id for sign operation --- .../main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenKeychain/src') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java index 40e265253..416dbce7c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java @@ -571,7 +571,7 @@ public class PgpSignEncrypt { new SignEncryptResult(SignEncryptResult.RESULT_PENDING_NFC, log); // Note that the checked key here is the master key, not the signing key // (although these are always the same on Yubikeys) - result.setNfcData(mSignatureMasterKeyId, e.hashToSign, e.hashAlgo, e.creationTimestamp, mSignaturePassphrase); + result.setNfcData(mSignatureSubKeyId, e.hashToSign, e.hashAlgo, e.creationTimestamp, mSignaturePassphrase); Log.d(Constants.TAG, "e.hashToSign"+ Hex.toHexString(e.hashToSign)); return result; } -- cgit v1.2.3 From 23b1ac1716e917b6092281c4e9378b3b9543e0ce Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Sat, 4 Oct 2014 16:01:59 +0200 Subject: fix plurals quantity string in ImportKeyResult --- .../sufficientlysecure/keychain/service/results/ImportKeyResult.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenKeychain/src') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java index b5174bc63..188162aec 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/ImportKeyResult.java @@ -154,7 +154,7 @@ public class ImportKeyResult extends OperationResult { duration = 0; color = Style.RED; str += " " + activity.getResources().getQuantityString( - R.plurals.import_keys_with_errors, mBadKeys); + R.plurals.import_keys_with_errors, mBadKeys, mBadKeys); } } else { -- cgit v1.2.3