From a655664c0bd177278826720dbac6b22f4e9e1cd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 16 Mar 2015 13:54:01 +0100 Subject: object oriented split user id --- .../keychain/keyimport/ImportKeysListEntry.java | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java index 7dac8b1e0..bb86d272f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/keyimport/ImportKeysListEntry.java @@ -307,24 +307,22 @@ public class ImportKeysListEntry implements Serializable, Parcelable { public void updateMergedUserIds() { mMergedUserIds = new HashMap<>(); for (String userId : mUserIds) { - String[] userIdSplit = KeyRing.splitUserId(userId); + KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); // TODO: comment field? - // name - if (userIdSplit[0] != null) { - // email - if (userIdSplit[1] != null) { - if (!mMergedUserIds.containsKey(userIdSplit[0])) { + if (userIdSplit.name != null) { + if (userIdSplit.email != null) { + if (!mMergedUserIds.containsKey(userIdSplit.name)) { HashSet emails = new HashSet<>(); - emails.add(userIdSplit[1]); - mMergedUserIds.put(userIdSplit[0], emails); + emails.add(userIdSplit.email); + mMergedUserIds.put(userIdSplit.name, emails); } else { - mMergedUserIds.get(userIdSplit[0]).add(userIdSplit[1]); + mMergedUserIds.get(userIdSplit.name).add(userIdSplit.email); } } else { // name only - mMergedUserIds.put(userIdSplit[0], new HashSet()); + mMergedUserIds.put(userIdSplit.name, new HashSet()); } } else { // fallback -- cgit v1.2.3