diff options
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java index e7bb6d7b1..cb077c55c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java @@ -421,18 +421,7 @@ public class PgpDecryptVerify { // key found in our database! signature = sigList.get(signatureIndex); - signatureResultBuilder.setSignatureAvailable(true); - signatureResultBuilder.setKnownKey(true); - signatureResultBuilder.setKeyId(signingRing.getMasterKeyId()); - try { - signatureResultBuilder.setPrimaryUserId(signingRing.getPrimaryUserIdWithFallback()); - } catch (PgpGeneralException e) { - Log.d(Constants.TAG, "No primary user id in keyring with master key id " + signingRing.getMasterKeyId()); - } - signatureResultBuilder.setSignatureKeyCertified(signingRing.getVerified() > 0); - signatureResultBuilder.setKeyExpired(signingKey.isExpired()); - signatureResultBuilder.setKeyRevoked(signingKey.isRevoked()); - signatureResultBuilder.setUserIds(signingKey.getUnorderedUserIds()); + signatureResultBuilder.initValid(signingRing, signingKey); JcaPGPContentVerifierBuilderProvider contentVerifierBuilderProvider = new JcaPGPContentVerifierBuilderProvider() @@ -658,18 +647,7 @@ public class PgpDecryptVerify { // key found in our database! signature = sigList.get(signatureIndex); - signatureResultBuilder.setSignatureAvailable(true); - signatureResultBuilder.setKnownKey(true); - signatureResultBuilder.setKeyId(signingRing.getMasterKeyId()); - try { - signatureResultBuilder.setPrimaryUserId(signingRing.getPrimaryUserIdWithFallback()); - } catch (PgpGeneralException e) { - Log.d(Constants.TAG, "No primary user id in key with master key id " + signingRing.getMasterKeyId()); - } - signatureResultBuilder.setSignatureKeyCertified(signingRing.getVerified() > 0); - signatureResultBuilder.setKeyExpired(signingKey.isExpired()); - signatureResultBuilder.setKeyRevoked(signingKey.isRevoked()); - signatureResultBuilder.setUserIds(signingKey.getUnorderedUserIds()); + signatureResultBuilder.initValid(signingRing, signingKey); JcaPGPContentVerifierBuilderProvider contentVerifierBuilderProvider = new JcaPGPContentVerifierBuilderProvider() |