moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-17 14:25:12 -05:00
Code Issues Releases Wiki Activity

Add SIGNATURE_KEY_REVOKED, SIGNATURE_KEY_EXPIRED, rename SIGNATURE_PUB_KEY_UNKNOWN

Browse Source
This commit is contained in:
Dominik Schürmann 2014-08-31 23:39:56 +02:00
parent 1d0eeef047
commit e0be0f648a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/org/openintents/openpgp/OpenPgpSignatureResult.java
View File

@ -37,12 +37,16 @@ public class OpenPgpSignatureResult implements Parcelable {
// generic error on signature verification // generic error on signature verification
public static final int SIGNATURE_ERROR = 0; 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; public static final int SIGNATURE_SUCCESS_CERTIFIED = 1;
// no public key was found for this signature verification // no key was found for this signature verification
public static final int SIGNATURE_UNKNOWN_PUB_KEY = 2; public static final int SIGNATURE_KEY_MISSING = 2;
// successfully verified signature, but with uncertified public key // successfully verified signature, but with uncertified key
public static final int SIGNATURE_SUCCESS_UNCERTIFIED = 3; 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; int status;
boolean signatureOnly; boolean signatureOnly;

6
src/org/openintents/openpgp/util/OpenPgpApi.java
View File

@ -47,8 +47,10 @@ public class OpenPgpApi {
* - No changes to existing methods -> backward compatible * - No changes to existing methods -> backward compatible
* - Introduction of ACTION_DECRYPT_METADATA, RESULT_METADATA, EXTRA_ORIGINAL_FILENAME, and OpenPgpMetadata parcel * - 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 * - 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 * General extras
@ -106,7 +108,7 @@ public class OpenPgpApi {
* Decrypts and verifies given input stream. This methods handles encrypted-only, signed-and-encrypted, * Decrypts and verifies given input stream. This methods handles encrypted-only, signed-and-encrypted,
* and also signed-only input. * and also signed-only input.
* <p/> * <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. * in addition a PendingIntent is returned via RESULT_INTENT to download missing keys.
* <p/> * <p/>
* optional extras: * optional extras: