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/ui/adapter/ImportKeysAdapter.java | 12 ++++++------ .../keychain/ui/adapter/MultiUserIdsAdapter.java | 21 ++++++++++----------- .../keychain/ui/adapter/SelectKeyCursorAdapter.java | 10 +++++----- .../keychain/ui/adapter/UserIdsAdapter.java | 14 +++++++------- .../keychain/ui/adapter/UserIdsAddedAdapter.java | 14 +++++++------- 5 files changed, 35 insertions(+), 36 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java index 429feb075..db88de676 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java @@ -140,25 +140,25 @@ public class ImportKeysAdapter extends ArrayAdapter { // main user id String userId = entry.getUserIds().get(0); - String[] userIdSplit = KeyRing.splitUserId(userId); + KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); // name - if (userIdSplit[0] != null) { + if (userIdSplit.name != null) { // show red user id if it is a secret key if (entry.isSecretKey()) { holder.mainUserId.setText(mActivity.getString(R.string.secret_key) - + " " + userIdSplit[0]); + + " " + userIdSplit.name); } else { - holder.mainUserId.setText(highlighter.highlight(userIdSplit[0])); + holder.mainUserId.setText(highlighter.highlight(userIdSplit.name)); } } else { holder.mainUserId.setText(R.string.user_id_no_name); } // email - if (userIdSplit[1] != null) { + if (userIdSplit.email != null) { holder.mainUserIdRest.setVisibility(View.VISIBLE); - holder.mainUserIdRest.setText(highlighter.highlight(userIdSplit[1])); + holder.mainUserIdRest.setText(highlighter.highlight(userIdSplit.email)); } else { holder.mainUserIdRest.setVisibility(View.GONE); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java index 5a0782e54..028f0fc9c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/MultiUserIdsAdapter.java @@ -33,7 +33,6 @@ import android.widget.TextView; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.pgp.KeyRing; import org.sufficientlysecure.keychain.service.CertifyActionsParcel.CertifyAction; -import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import java.util.ArrayList; @@ -83,9 +82,9 @@ public class MultiUserIdsAdapter extends CursorAdapter { { // first one String userId = uids.get(0); - String[] splitUserId = KeyRing.splitUserId(userId); - if (splitUserId[0] != null) { - vName.setText(splitUserId[0]); + KeyRing.UserId splitUserId = KeyRing.splitUserId(userId); + if (splitUserId.name != null) { + vName.setText(splitUserId.name); } else { vName.setText(R.string.user_id_no_name); } @@ -93,9 +92,9 @@ public class MultiUserIdsAdapter extends CursorAdapter { if (isHeader == 1) { vHeaderId.setVisibility(View.VISIBLE); String message; - if (splitUserId[0] != null) { + if (splitUserId.name != null) { message = mContext.getString(R.string.section_uids_to_certify) + - splitUserId[0]; + splitUserId.name; } else { message = mContext.getString(R.string.section_uids_to_certify) + context.getString(R.string.user_id_no_name); @@ -108,13 +107,13 @@ public class MultiUserIdsAdapter extends CursorAdapter { StringBuilder lines = new StringBuilder(); for (String uid : uids) { - String[] splitUserId = KeyRing.splitUserId(uid); - if (splitUserId[1] == null) { + KeyRing.UserId splitUserId = KeyRing.splitUserId(uid); + if (splitUserId.email == null) { continue; } - lines.append(splitUserId[1]); - if (splitUserId[2] != null) { - lines.append(" (").append(splitUserId[2]).append(")"); + lines.append(splitUserId.email); + if (splitUserId.comment != null) { + lines.append(" (").append(splitUserId.comment).append(")"); } lines.append('\n'); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java index 892e30a54..3308a4500 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java @@ -122,16 +122,16 @@ abstract public class SelectKeyCursorAdapter extends CursorAdapter { ViewHolderItem h = (ViewHolderItem) view.getTag(); String userId = cursor.getString(mIndexUserId); - String[] userIdSplit = KeyRing.splitUserId(userId); + KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); - if (userIdSplit[0] != null) { - h.mainUserId.setText(highlighter.highlight(userIdSplit[0])); + if (userIdSplit.name != null) { + h.mainUserId.setText(highlighter.highlight(userIdSplit.name)); } else { h.mainUserId.setText(R.string.user_id_no_name); } - if (userIdSplit[1] != null) { + if (userIdSplit.email != null) { h.mainUserIdRest.setVisibility(View.VISIBLE); - h.mainUserIdRest.setText(highlighter.highlight(userIdSplit[1])); + h.mainUserIdRest.setText(highlighter.highlight(userIdSplit.email)); } else { h.mainUserIdRest.setVisibility(View.GONE); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java index 3486f1516..d1103ac1f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAdapter.java @@ -72,20 +72,20 @@ public class UserIdsAdapter extends UserAttributesAdapter { vDeleteButton.setVisibility(View.GONE); // not used String userId = cursor.getString(INDEX_USER_ID); - String[] splitUserId = KeyRing.splitUserId(userId); - if (splitUserId[0] != null) { - vName.setText(splitUserId[0]); + KeyRing.UserId splitUserId = KeyRing.splitUserId(userId); + if (splitUserId.name != null) { + vName.setText(splitUserId.name); } else { vName.setText(R.string.user_id_no_name); } - if (splitUserId[1] != null) { - vAddress.setText(splitUserId[1]); + if (splitUserId.email != null) { + vAddress.setText(splitUserId.email); vAddress.setVisibility(View.VISIBLE); } else { vAddress.setVisibility(View.GONE); } - if (splitUserId[2] != null) { - vComment.setText(splitUserId[2]); + if (splitUserId.comment != null) { + vComment.setText(splitUserId.comment); vComment.setVisibility(View.VISIBLE); } else { vComment.setVisibility(View.GONE); diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java index 970855c77..c7197b46d 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/UserIdsAddedAdapter.java @@ -92,20 +92,20 @@ public class UserIdsAddedAdapter extends ArrayAdapter { // save reference to model item holder.mModel = getItem(position); - String[] splitUserId = KeyRing.splitUserId(holder.mModel); - if (splitUserId[0] != null) { - holder.vName.setText(splitUserId[0]); + KeyRing.UserId splitUserId = KeyRing.splitUserId(holder.mModel); + if (splitUserId.name != null) { + holder.vName.setText(splitUserId.name); } else { holder.vName.setText(R.string.user_id_no_name); } - if (splitUserId[1] != null) { - holder.vAddress.setText(splitUserId[1]); + if (splitUserId.email != null) { + holder.vAddress.setText(splitUserId.email); holder.vAddress.setVisibility(View.VISIBLE); } else { holder.vAddress.setVisibility(View.GONE); } - if (splitUserId[2] != null) { - holder.vComment.setText(splitUserId[2]); + if (splitUserId.comment != null) { + holder.vComment.setText(splitUserId.comment); holder.vComment.setVisibility(View.VISIBLE); } else { holder.vComment.setVisibility(View.GONE); -- cgit v1.2.3