From 708d0c9a5ab76219c4ddff73324d814eda5d3873 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 18 Feb 2014 13:19:41 +0100 Subject: better error check --- .../keychain/service/remote/OpenPgpService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'OpenPGP-Keychain/src/main/java/org') diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java index f6aaffbf6..d765f28cb 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java @@ -190,7 +190,7 @@ public class OpenPgpService extends RemoteService { long[] keyIds; if (params.containsKey(OpenPgpConstants.PARAMS_KEY_IDS)) { keyIds = params.getLongArray(OpenPgpConstants.PARAMS_KEY_IDS); - } else { + } else if (params.containsKey(OpenPgpConstants.PARAMS_USER_IDS)) { // get key ids based on given user ids String[] userIds = params.getStringArray(OpenPgpConstants.PARAMS_USER_IDS); // give params through to activity... @@ -202,6 +202,12 @@ public class OpenPgpService extends RemoteService { // if not success -> result contains a PendingIntent for user interaction return result; } + } else { + Bundle result = new Bundle(); + result.putInt(OpenPgpConstants.RESULT_CODE, OpenPgpConstants.RESULT_CODE_ERROR); + result.putParcelable(OpenPgpConstants.RESULT_ERRORS, + new OpenPgpError(OpenPgpError.GENERIC_ERROR, "Missing parameter user_ids or key_ids!")); + return result; } // add own key for encryption -- cgit v1.2.3