1 files changed, 2 insertions, 4 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 db0a9b137..4adacaf23 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java
@@ -19,7 +19,6 @@
 package org.sufficientlysecure.keychain.pgp;
 
 import org.spongycastle.openpgp.PGPKeyRing;
-import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.pgp.exception.PgpKeyNotFoundException;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 
@@ -80,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));