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

1 files changed, 8 insertions, 3 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 3d41c928b..c7241c723 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/OpenPgpSignatureResultBuilder.java
@@ -103,9 +103,14 @@ public class OpenPgpSignatureResultBuilder {
         Log.d(Constants.TAG, "signingRing.getUnorderedUserIds(): " + signingRing.getUnorderedUserIds());
         setUserIds(signingRing.getUnorderedUserIds());
 
-        // from KEY
-        setKeyExpired(signingKey.isExpired());
-        setKeyRevoked(signingKey.isRevoked());
+        // either master key is expired/revoked or this specific subkey is expired/revoked
+        try {
+            setKeyExpired(signingRing.isExpired() || signingKey.isExpired());
+            setKeyRevoked(signingRing.isRevoked() || signingKey.isRevoked());
+        } catch (PgpGeneralException e) {
+            Log.e(Constants.TAG, "shouldn't happen!");
+            setKeyRevoked(true);
+        }
     }
 
     public OpenPgpSignatureResult build() {