Clarifications in remote API code

1 files changed, 7 insertions, 7 deletions

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<Long> keyIds = new ArrayList<>();
-        ArrayList<String> missingUserIds = new ArrayList<>();
-        ArrayList<String> duplicateUserIds = new ArrayList<>();
+        ArrayList<String> missingEmails = new ArrayList<>();
+        ArrayList<String> 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,