From 4f37c88ea7568ddbb864c599c12c130a21791d15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 25 Oct 2014 22:25:11 +0200 Subject: Fix color in import list --- .../keychain/ui/adapter/ImportKeysAdapter.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java') 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 a9795cdd1..f37702a56 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 @@ -138,13 +138,10 @@ public class ImportKeysAdapter extends ArrayAdapter { if (entry.isSecretKey()) { holder.mainUserId.setText(mActivity.getString(R.string.secret_key) + " " + userIdSplit[0]); - holder.mainUserId.setTextColor(Color.RED); } else { holder.mainUserId.setText(highlighter.highlight(userIdSplit[0])); - holder.mainUserId.setTextColor(Color.BLACK); } } else { - holder.mainUserId.setTextColor(Color.BLACK); holder.mainUserId.setText(R.string.user_id_no_name); } @@ -187,9 +184,14 @@ public class ImportKeysAdapter extends ArrayAdapter { holder.status.setVisibility(View.GONE); holder.algorithm.setVisibility(View.VISIBLE); - holder.mainUserId.setTextColor(getContext().getResources().getColor(R.color.black)); - holder.mainUserIdRest.setTextColor(getContext().getResources().getColor(R.color.black)); - holder.keyId.setTextColor(getContext().getResources().getColor(R.color.black)); + if (entry.isSecretKey()) { + holder.mainUserId.setTextColor(Color.RED); + } else { + holder.mainUserId.setTextColor(Color.BLACK); + } + + holder.mainUserIdRest.setTextColor(Color.BLACK); + holder.keyId.setTextColor(Color.BLACK); } if (entry.getUserIds().size() == 1) { -- cgit v1.2.3