From 954825a42ab3ffb4dc8c7431f50258a924fb5d18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 7 Jul 2015 23:08:38 +0200 Subject: Clarifications in remote API code --- .../keychain/remote/OpenPgpService.java | 14 ++++++------- .../keychain/remote/ui/RemoteServiceActivity.java | 24 +++++++++++----------- OpenKeychain/src/main/res/values/strings.xml | 4 ++-- 3 files changed, 21 insertions(+), 21 deletions(-) (limited to 'OpenKeychain') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index ac66bd097..af99f01c9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -88,8 +88,8 @@ public class OpenPgpService extends RemoteService { boolean duplicateUserIdsCheck = false; ArrayList keyIds = new ArrayList<>(); - ArrayList missingUserIds = new ArrayList<>(); - ArrayList duplicateUserIds = new ArrayList<>(); + ArrayList missingEmails = new ArrayList<>(); + ArrayList duplicateEmails = new ArrayList<>(); if (!noUserIdsCheck) { for (String email : encryptionUserIds) { // try to find the key for this specific email @@ -102,13 +102,13 @@ public class OpenPgpService extends RemoteService { keyIds.add(id); } else { missingUserIdsCheck = true; - missingUserIds.add(email); + missingEmails.add(email); Log.d(Constants.TAG, "user id missing"); } - // another entry for this email -> too keys with the same email inside user id + // another entry for this email -> two keys with the same email inside user id if (cursor != null && cursor.moveToNext()) { duplicateUserIdsCheck = true; - duplicateUserIds.add(email); + duplicateEmails.add(email); // also pre-select long id = cursor.getLong(cursor.getColumnIndex(KeyRings.MASTER_KEY_ID)); @@ -136,8 +136,8 @@ public class OpenPgpService extends RemoteService { intent.setAction(RemoteServiceActivity.ACTION_SELECT_PUB_KEYS); intent.putExtra(RemoteServiceActivity.EXTRA_SELECTED_MASTER_KEY_IDS, keyIdsArray); intent.putExtra(RemoteServiceActivity.EXTRA_NO_USER_IDS_CHECK, noUserIdsCheck); - intent.putExtra(RemoteServiceActivity.EXTRA_MISSING_USER_IDS, missingUserIds); - intent.putExtra(RemoteServiceActivity.EXTRA_DUPLICATE_USER_IDS, duplicateUserIds); + intent.putExtra(RemoteServiceActivity.EXTRA_MISSING_EMAILS, missingEmails); + intent.putExtra(RemoteServiceActivity.EXTRA_DUPLICATE_EMAILS, duplicateEmails); intent.putExtra(RemoteServiceActivity.EXTRA_DATA, data); PendingIntent pi = PendingIntent.getActivity(getBaseContext(), 0, diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java index 5facde64f..a2e781e8a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java @@ -69,8 +69,8 @@ public class RemoteServiceActivity extends BaseActivity { public static final String EXTRA_ACC_NAME = "acc_name"; // select pub keys action public static final String EXTRA_SELECTED_MASTER_KEY_IDS = "master_key_ids"; - public static final String EXTRA_MISSING_USER_IDS = "missing_user_ids"; - public static final String EXTRA_DUPLICATE_USER_IDS = "dublicate_user_ids"; + public static final String EXTRA_MISSING_EMAILS = "missing_emails"; + public static final String EXTRA_DUPLICATE_EMAILS = "dublicate_emails"; public static final String EXTRA_NO_USER_IDS_CHECK = "no_user_ids"; // error message public static final String EXTRA_ERROR_MESSAGE = "error_message"; @@ -222,10 +222,10 @@ public class RemoteServiceActivity extends BaseActivity { case ACTION_SELECT_PUB_KEYS: { long[] selectedMasterKeyIds = intent.getLongArrayExtra(EXTRA_SELECTED_MASTER_KEY_IDS); boolean noUserIdsCheck = intent.getBooleanExtra(EXTRA_NO_USER_IDS_CHECK, true); - ArrayList missingUserIds = intent - .getStringArrayListExtra(EXTRA_MISSING_USER_IDS); - ArrayList dublicateUserIds = intent - .getStringArrayListExtra(EXTRA_DUPLICATE_USER_IDS); + ArrayList missingEmails = intent + .getStringArrayListExtra(EXTRA_MISSING_EMAILS); + ArrayList duplicateEmails = intent + .getStringArrayListExtra(EXTRA_DUPLICATE_EMAILS); SpannableStringBuilder ssb = new SpannableStringBuilder(); final SpannableString textIntro = new SpannableString( @@ -235,23 +235,23 @@ public class RemoteServiceActivity extends BaseActivity { textIntro.setSpan(new StyleSpan(Typeface.BOLD), 0, textIntro.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.append(textIntro); - if (missingUserIds != null && missingUserIds.size() > 0) { + if (missingEmails != null && missingEmails.size() > 0) { ssb.append("\n\n"); ssb.append(getString(R.string.api_select_pub_keys_missing_text)); ssb.append("\n"); - for (String userId : missingUserIds) { - SpannableString ss = new SpannableString(userId + "\n"); + for (String emails : missingEmails) { + SpannableString ss = new SpannableString(emails + "\n"); ss.setSpan(new BulletSpan(15, Color.BLACK), 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.append(ss); } } - if (dublicateUserIds != null && dublicateUserIds.size() > 0) { + if (duplicateEmails != null && duplicateEmails.size() > 0) { ssb.append("\n\n"); ssb.append(getString(R.string.api_select_pub_keys_dublicates_text)); ssb.append("\n"); - for (String userId : dublicateUserIds) { - SpannableString ss = new SpannableString(userId + "\n"); + for (String email : duplicateEmails) { + SpannableString ss = new SpannableString(email + "\n"); ss.setSpan(new BulletSpan(15, Color.BLACK), 0, ss.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); ssb.append(ss); diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 2e6552b0f..adf30a747 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -569,8 +569,8 @@ "Allow access" "Disallow access" "Please select a key!" - "No keys were found for these identities:" - "More than one key exist for these identities:" + "No keys were found for these emails:" + "More than one key exist for these emails:" "Please review the list of recipients!" "Please select the recipients!" "Signature check failed! Have you installed this app from a different source? If you are sure that this is not an attack, revoke this app's registration in OpenKeychain and then register the app again." -- cgit v1.2.3