Big error screen if signature is invalid or key is revoked/expired, also fixes signature status for expired and revoked keys

1 files changed, 11 insertions, 0 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 905cae17e..b1e7eaeb5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedKeyRing.java
@@ -25,6 +25,7 @@ import org.sufficientlysecure.keychain.util.IterableIterator;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
+import java.util.Date;
 
 /** A generic wrapped PGPKeyRing object.
  *
@@ -76,6 +77,16 @@ public abstract class CanonicalizedKeyRing extends KeyRing {
         return getRing().getPublicKey().isRevoked();
     }
 
+    public boolean isExpired() throws PgpGeneralException {
+        // 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 now = new Date();
+        return creationDate.after(now) || (expiryDate != null && expiryDate.before(now));
+    }
+
     public boolean canCertify() throws PgpGeneralException {
         return getRing().getPublicKey().isEncryptionKey();
     }