aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-10-25 22:25:11 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-10-25 22:25:11 +0200
commit4f37c88ea7568ddbb864c599c12c130a21791d15 (patch)
tree44901b770fb83e89814b20f144306667cc2b7ec1 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
parentc2e7c2416f7598bd023ee99bde434e20197f4052 (diff)
downloadopen-keychain-4f37c88ea7568ddbb864c599c12c130a21791d15.tar.gz
open-keychain-4f37c88ea7568ddbb864c599c12c130a21791d15.tar.bz2
open-keychain-4f37c88ea7568ddbb864c599c12c130a21791d15.zip
Fix color in import list
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java14
1 files changed, 8 insertions, 6 deletions
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<ImportKeysListEntry> {
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<ImportKeysListEntry> {
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) {