diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 02:08:27 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 02:08:27 +0100 |
| commit | 5f39cb3ec0d1d3f77d48fdbb428a2147dfe11d03 (patch) | |
| tree | 3c180dc1627a400f487871fc4db29d14296f05ff /libraries | |
| parent | 494a5fa414fe5962bdee0d50e761da9dc0cc1cc7 (diff) | |
| download | open-keychain-5f39cb3ec0d1d3f77d48fdbb428a2147dfe11d03.tar.gz open-keychain-5f39cb3ec0d1d3f77d48fdbb428a2147dfe11d03.tar.bz2 open-keychain-5f39cb3ec0d1d3f77d48fdbb428a2147dfe11d03.zip | |
fix passtrough of params
Diffstat (limited to 'libraries')
2 files changed, 4 insertions, 5 deletions
diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java b/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java index 5f67ddf88..5c38d3304 100644 --- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java +++ b/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpApi.java @@ -131,11 +131,7 @@ public class OpenPgpApi { try { params.putInt(OpenPgpConstants.PARAMS_API_VERSION, OpenPgpConstants.API_VERSION); - // default result is error Bundle result = new Bundle(); - result.putInt(OpenPgpConstants.RESULT_CODE, OpenPgpConstants.RESULT_CODE_ERROR); - result.putParcelable(OpenPgpConstants.RESULT_ERRORS, - new OpenPgpError(OpenPgpError.GENERIC_ERROR, "This should never happen!")); if (operationId == OPERATION_GET_KEY_IDS) { result = mService.getKeyIds(params); diff --git a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java b/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java index 64bc92fdd..229c8d42a 100644 --- a/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java +++ b/libraries/keychain-api-library/src/main/java/org/openintents/openpgp/util/OpenPgpConstants.java @@ -33,7 +33,7 @@ public class OpenPgpConstants { public static final String PARAMS_USER_IDS = "user_ids"; public static final String PARAMS_KEY_IDS = "key_ids"; - /* Bundle return */ + /* Service Bundle returns */ public static final String RESULT_CODE = "result_code"; public static final String RESULT_SIGNATURE = "signature"; public static final String RESULT_ERRORS = "error"; @@ -46,4 +46,7 @@ public class OpenPgpConstants { // executeServiceMethod intent and do it again with params from intent public static final int RESULT_CODE_USER_INTERACTION_REQUIRED = 2; + /* PendingIntent returns */ + public static final String PI_RESULT_PARAMS = "params"; + } |