diff options
| author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-02-28 01:30:41 +0530 |
|---|---|---|
| committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-02-28 01:30:41 +0530 |
| commit | 960a1631857b6bbad2e6fedeab63fe7cc1edd063 (patch) | |
| tree | fba94cdc31c9e5704c3da6795b2e65e833146647 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java | |
| parent | d776bd2888907b3bc953f48e9c490afe8275c4e1 (diff) | |
| parent | 2cd7be6373015e7e05d8418c997fa0c063c40c5a (diff) | |
| download | open-keychain-960a1631857b6bbad2e6fedeab63fe7cc1edd063.tar.gz open-keychain-960a1631857b6bbad2e6fedeab63fe7cc1edd063.tar.bz2 open-keychain-960a1631857b6bbad2e6fedeab63fe7cc1edd063.zip | |
Merge branch 'development' of https://github.com/open-keychain/open-keychain into development
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 | 4 |
1 files changed, 2 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 ed4715681..46defebf7 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java @@ -104,8 +104,8 @@ public class OpenPgpSignatureResultBuilder { setUserIds(signingRing.getUnorderedUserIds()); // either master key is expired/revoked or this specific subkey is expired/revoked - setKeyExpired(signingRing.isExpired() || signingKey.isExpired()); - setKeyRevoked(signingRing.isRevoked() || signingKey.isRevoked()); + setKeyExpired(signingRing.isExpired() || signingKey.isMaybeExpired()); + setKeyRevoked(signingRing.isRevoked() || signingKey.isMaybeRevoked()); } public OpenPgpSignatureResult build() { |