From 6d53051e1e27e0e75bc0ec2e1da31a8771eb615a Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 15 May 2024 14:21:53 +0200 Subject: [PATCH 1/2] Update documentation for `ACTION_GET_KEY` --- .../java/org/openintents/openpgp/util/OpenPgpApi.java | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 98d3888..9847bba 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 @@ -202,9 +202,20 @@ public class OpenPgpApi { * If an Output stream has been defined the whole public key is returned. * required extras: * long EXTRA_KEY_ID + * or + * String EXTRA_USER_ID * * optional extras: * String EXTRA_REQUEST_ASCII_ARMOR (request that the returned key is encoded in ASCII Armor) + * boolean EXTRA_MINIMIZE (returns a minimized version of the key, default is false) + * String EXTRA_MINIMIZE_USER_ID + * + * The minimized version of a key includes: + * - the master key + * - the current best signing key (if any) + * - one encryption key (if any) + * - the user id that matches the EXTRA_MINIMIZE_USER_ID value, or the primary user id if none matches + * each with their most recent binding certificates */ public static final String ACTION_GET_KEY = "org.openintents.openpgp.action.GET_KEY"; From dc93f1cf94b59a32439e986dbc1442ba3541a8a0 Mon Sep 17 00:00:00 2001 From: cketti Date: Wed, 15 May 2024 14:30:19 +0200 Subject: [PATCH 2/2] Fix documentation for `EXTRA_REQUEST_ASCII_ARMOR` --- .../src/main/java/org/openintents/openpgp/util/OpenPgpApi.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9847bba..8c115a4 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 @@ -206,7 +206,7 @@ public class OpenPgpApi { * String EXTRA_USER_ID * * optional extras: - * String EXTRA_REQUEST_ASCII_ARMOR (request that the returned key is encoded in ASCII Armor) + * boolean EXTRA_REQUEST_ASCII_ARMOR (request that the returned key is encoded in ASCII Armor, default is false) * boolean EXTRA_MINIMIZE (returns a minimized version of the key, default is false) * String EXTRA_MINIMIZE_USER_ID *