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/CanonicalizedKeyRing.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/CanonicalizedKeyRing.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java index bbf136dac..4adacaf23 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java @@ -79,9 +79,8 @@ public abstract class CanonicalizedKeyRing extends KeyRing { public boolean isExpired() { // Is the master key expired? - Date creationDate = getRing().getPublicKey().getCreationTime(); - Date expiryDate = getRing().getPublicKey().getValidSeconds() > 0 - ? new Date(creationDate.getTime() + getRing().getPublicKey().getValidSeconds() * 1000) : null; + Date creationDate = getPublicKey().getCreationTime(); + Date expiryDate = getPublicKey().getExpiryTime(); Date now = new Date(); return creationDate.after(now) || (expiryDate != null && expiryDate.before(now)); |