narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

Increase version to 4

Browse source
This commit is contained in:
Dominik Schürmann 2014-08-11 17:19:23 +02:00
parent 4f6475f11b
commit 6bec5eedde
1 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/org/openintents/openpgp/util/OpenPgpApi.java
View file

@ -34,9 +34,22 @@ public class OpenPgpApi {
public static final String TAG = "OpenPgp API"; public static final String TAG = "OpenPgp API";
public static final int API_VERSION = 3;
public static final String SERVICE_INTENT = "org.openintents.openpgp.IOpenPgpService"; public static final String SERVICE_INTENT = "org.openintents.openpgp.IOpenPgpService";
/**
* Version history
* ---------------
* <p/>
* 3:
* - first public stable version
* <p/>
* 4:
* - No changes to existing methods -> backward compatible
* - Introduction of ACTION_DECRYPT_METADATA, RESULT_METADATA, and OpenPgpDecryptMetadata parcel
* - Introduction of internal NFC extras: EXTRA_NFC_SIGNED_HASH, EXTRA_NFC_SIG_CREATION_TIMESTAMP
*/
public static final int API_VERSION = 4;
/** /**
* General extras * General extras
* -------------- * --------------
@ -54,7 +67,7 @@ public class OpenPgpApi {
* Sign only * Sign only
* <p/> * <p/>
* optional extras: * optional extras:
* boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for ouput) * boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for output)
* String EXTRA_PASSPHRASE (key passphrase) * String EXTRA_PASSPHRASE (key passphrase)
*/ */
public static final String ACTION_SIGN = "org.openintents.openpgp.action.SIGN"; public static final String ACTION_SIGN = "org.openintents.openpgp.action.SIGN";
@ -68,7 +81,7 @@ public class OpenPgpApi {
* long[] EXTRA_KEY_IDS * long[] EXTRA_KEY_IDS
* <p/> * <p/>
* optional extras: * optional extras:
* boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for ouput) * boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for output)
* String EXTRA_PASSPHRASE (key passphrase) * String EXTRA_PASSPHRASE (key passphrase)
*/ */
public static final String ACTION_ENCRYPT = "org.openintents.openpgp.action.ENCRYPT"; public static final String ACTION_ENCRYPT = "org.openintents.openpgp.action.ENCRYPT";
@ -82,7 +95,7 @@ public class OpenPgpApi {
* long[] EXTRA_KEY_IDS * long[] EXTRA_KEY_IDS
* <p/> * <p/>
* optional extras: * optional extras:
* boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for ouput) * boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for output)
* String EXTRA_PASSPHRASE (key passphrase) * String EXTRA_PASSPHRASE (key passphrase)
*/ */
public static final String ACTION_SIGN_AND_ENCRYPT = "org.openintents.openpgp.action.SIGN_AND_ENCRYPT"; public static final String ACTION_SIGN_AND_ENCRYPT = "org.openintents.openpgp.action.SIGN_AND_ENCRYPT";
@ -95,13 +108,24 @@ public class OpenPgpApi {
* 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:
* boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for ouput) * boolean EXTRA_REQUEST_ASCII_ARMOR (request ascii armor for output)
* <p/> * <p/>
* returned extras: * returned extras:
* OpenPgpSignatureResult RESULT_SIGNATURE * OpenPgpSignatureResult RESULT_SIGNATURE
* OpenPgpDecryptMetadata RESULT_METADATA
*/ */
public static final String ACTION_DECRYPT_VERIFY = "org.openintents.openpgp.action.DECRYPT_VERIFY"; public static final String ACTION_DECRYPT_VERIFY = "org.openintents.openpgp.action.DECRYPT_VERIFY";
/**
* Decrypts the header of an encrypted file to retrieve metadata such as original filename.
* <p/>
* This does not decrypt the actual content of the file.
* <p/>
* returned extras:
* OpenPgpDecryptMetadata RESULT_METADATA
*/
public static final String ACTION_DECRYPT_METADATA = "org.openintents.openpgp.action.DECRYPT_METADATA";
/** /**
* Get key ids based on given user ids (=emails) * Get key ids based on given user ids (=emails)
* <p/> * <p/>
@ -165,6 +189,7 @@ public class OpenPgpApi {
// DECRYPT_VERIFY // DECRYPT_VERIFY
public static final String RESULT_SIGNATURE = "signature"; public static final String RESULT_SIGNATURE = "signature";
public static final String RESULT_METADATA = "metadata";
IOpenPgpService mService; IOpenPgpService mService;
Context mContext; Context mContext;