From 3b6681ecf669c4662d4a7cf4d276840e8bd40e7d Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Wed, 2 Mar 2016 15:20:47 +0100
Subject: Bump version to 11, add changelog, and document changes

---
 CHANGELOG.md                                                  |  6 +++++-
 .../main/java/org/openintents/openpgp/util/OpenPgpApi.java    | 11 +++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93b6824..d6a0ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Version history
 
+## Version 11
+  * Added a simple no-op to check if the api is available and app has permission as ACTION_CHECK_PERMISSON
+  * The ACTION_DETACHED_SIGN action now returns RESULT_SIGNATURE_MICALG, which contains the algorithm name used for signing (relevant for PGP/MIME)
+
 ## Version 10
   * Retrieve whole public key via ACTION_GET_KEY
 
@@ -45,4 +49,4 @@
   * Introduction of internal NFC extras: EXTRA_NFC_SIGNED_HASH, EXTRA_NFC_SIG_CREATION_TIMESTAMP
 
 ## Version 3
-  * First public stable version
\ No newline at end of file
+  * First public stable version
diff --git a/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java b/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java
index f0291a9..658823a 100644
--- a/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java
+++ b/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java
@@ -41,7 +41,7 @@ public class OpenPgpApi {
     /**
      * see CHANGELOG.md
      */
-    public static final int API_VERSION = 10;
+    public static final int API_VERSION = 11;
 
     /**
      * General extras
@@ -56,7 +56,13 @@ public class OpenPgpApi {
      * PendingIntent RESULT_INTENT               (if RESULT_CODE == RESULT_CODE_USER_INTERACTION_REQUIRED)
      */
 
-    // TODO document
+    /**
+     * This action performs no operation, but can be used to check if the App has permission
+     * to access the API in general, returning a user interaction PendingIntent otherwise.
+     * This can be used to trigger the permission dialog explicitly.
+     *
+     * This action uses no extras.
+     */
     public static final String ACTION_CHECK_PERMISSION = "org.openintents.openpgp.action.CHECK_PERMISSION";
 
     /**
@@ -98,6 +104,7 @@ public class OpenPgpApi {
      * <p/>
      * returned extras:
      * byte[]        RESULT_DETACHED_SIGNATURE
+     * String        RESULT_SIGNATURE_MICALG     (contains the name of the used signature algorithm as a string)
      */
     public static final String ACTION_DETACHED_SIGN = "org.openintents.openpgp.action.DETACHED_SIGN";
 
-- 
cgit v1.2.3