diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-09 16:25:53 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-10-09 16:25:53 +0200 |
| commit | 340ed7c08dc59ac4a90069112aa599c36f94d4b9 (patch) | |
| tree | 8eb78f75b98f710e59241b8fc5d969e627bbb537 /OpenKeychain/src/main | |
| parent | 9d01490d4e254bc9d9acbe4bf53ec22e53411495 (diff) | |
| parent | 23b1ac1716e917b6092281c4e9378b3b9543e0ce (diff) | |
| download | open-keychain-340ed7c08dc59ac4a90069112aa599c36f94d4b9.tar.gz open-keychain-340ed7c08dc59ac4a90069112aa599c36f94d4b9.tar.bz2 open-keychain-340ed7c08dc59ac4a90069112aa599c36f94d4b9.zip | |
Merge remote-tracking branch 'origin/master' into development
Diffstat (limited to 'OpenKeychain/src/main')
2 files changed, 2 insertions, 2 deletions
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; } 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 0d71af876..b54dcc5d6 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 @@ -163,7 +163,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 { |