Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN

Dominik Schürmann created 11 years ago

Change summary

src/org/openintents/openpgp/OpenPgpSignatureResult.java | 12 +++++++---
src/org/openintents/openpgp/util/OpenPgpApi.java        |  6 +++-
2 files changed, 12 insertions(+), 6 deletions(-)

Detailed changes

src/org/openintents/openpgp/OpenPgpSignatureResult.java

@@ -37,12 +37,16 @@ public class OpenPgpSignatureResult implements Parcelable {
 
     // generic error on signature verification
     public static final int SIGNATURE_ERROR = 0;
-    // successfully verified signature, with certified public key
+    // successfully verified signature, with certified key
     public static final int SIGNATURE_SUCCESS_CERTIFIED = 1;
-    // no public key was found for this signature verification
-    public static final int SIGNATURE_UNKNOWN_PUB_KEY = 2;
-    // successfully verified signature, but with uncertified public key
+    // no key was found for this signature verification
+    public static final int SIGNATURE_KEY_MISSING = 2;
+    // successfully verified signature, but with uncertified key
     public static final int SIGNATURE_SUCCESS_UNCERTIFIED = 3;
+    // key has been revoked
+    public static final int SIGNATURE_KEY_REVOKED = 4;
+    // key is expired
+    public static final int SIGNATURE_KEY_EXPIRED = 5;
 
     int status;
     boolean signatureOnly;

src/org/openintents/openpgp/util/OpenPgpApi.java

@@ -47,8 +47,10 @@ public class OpenPgpApi {
      * - No changes to existing methods -> backward compatible
      * - Introduction of ACTION_DECRYPT_METADATA, RESULT_METADATA, EXTRA_ORIGINAL_FILENAME, and OpenPgpMetadata parcel
      * - Introduction of internal NFC extras: EXTRA_NFC_SIGNED_HASH, EXTRA_NFC_SIG_CREATION_TIMESTAMP
+     * 5:
+     * - OpenPgpSignatureResult: new SIGNATURE_KEY_REVOKED and SIGNATURE_KEY_EXPIRED
      */
-    public static final int API_VERSION = 4;
+    public static final int API_VERSION = 5;
 
     /**
      * General extras
@@ -106,7 +108,7 @@ public class OpenPgpApi {
      * Decrypts and verifies given input stream. This methods handles encrypted-only, signed-and-encrypted,
      * and also signed-only input.
      * <p/>
-     * If OpenPgpSignatureResult.getStatus() == OpenPgpSignatureResult.SIGNATURE_UNKNOWN_PUB_KEY
+     * If OpenPgpSignatureResult.getStatus() == OpenPgpSignatureResult.SIGNATURE_KEY_MISSING
      * in addition a PendingIntent is returned via RESULT_INTENT to download missing keys.
      * <p/>
      * optional extras: