diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 20:05:56 +0200 |
commit | 6cf7e3e541ff954f5f9065ab52e6cee93c0643d3 (patch) | |
tree | 090937fb456a6fa594a49cafffd1de01a3c35e48 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java | |
parent | 7619083d5c0a7a2ca0c6ed4a6f8317b31ca005f5 (diff) | |
parent | ba9b8f3a6009ca60abffccc3e3fbd160e0fa420c (diff) | |
download | open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.gz open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.tar.bz2 open-keychain-6cf7e3e541ff954f5f9065ab52e6cee93c0643d3.zip |
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java index 9d059b58f..2dd1e2dde 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java @@ -91,11 +91,12 @@ public class OpenPgpSignatureResultBuilder { return mInsecure; } - public void initValid(CanonicalizedPublicKeyRing signingRing, - CanonicalizedPublicKey signingKey) { + public void initValid(CanonicalizedPublicKey signingKey) { setSignatureAvailable(true); setKnownKey(true); + CanonicalizedKeyRing signingRing = signingKey.getKeyRing(); + // from RING setKeyId(signingRing.getMasterKeyId()); try { |