diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-15 12:48:54 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-10-15 12:48:54 +0200 |
| commit | be9b483ee877779a905de965c6b88fb47332b069 (patch) | |
| tree | d238e77c78ee1869ec71b312f129d4bd79bdcd7c /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | |
| parent | c7e2b8424e2c833015dd390ba6fd21f71957858b (diff) | |
| download | open-keychain-be9b483ee877779a905de965c6b88fb47332b069.tar.gz open-keychain-be9b483ee877779a905de965c6b88fb47332b069.tar.bz2 open-keychain-be9b483ee877779a905de965c6b88fb47332b069.zip | |
color experiments
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java index 8aa6db28d..0e848a068 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -647,30 +647,34 @@ public class KeyListFragment extends LoaderFragment // Note: order is important! if (isRevoked) { - KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, KeyFormattingUtils.STATE_REVOKED); + KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, null, KeyFormattingUtils.STATE_REVOKED, true); h.mStatus.setVisibility(View.VISIBLE); h.mSlinger.setVisibility(View.GONE); + h.mMainUserId.setTextColor(context.getResources().getColor(R.color.bg_gray)); + h.mMainUserIdRest.setTextColor(context.getResources().getColor(R.color.bg_gray)); } else if (isExpired) { - KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, KeyFormattingUtils.STATE_EXPIRED); + KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, null, KeyFormattingUtils.STATE_EXPIRED, true); h.mStatus.setVisibility(View.VISIBLE); h.mSlinger.setVisibility(View.GONE); + h.mMainUserId.setTextColor(context.getResources().getColor(R.color.bg_gray)); + h.mMainUserIdRest.setTextColor(context.getResources().getColor(R.color.bg_gray)); } else if (isSecret) { h.mStatus.setVisibility(View.GONE); h.mSlinger.setVisibility(View.VISIBLE); + h.mMainUserId.setTextColor(context.getResources().getColor(R.color.black)); + h.mMainUserIdRest.setTextColor(context.getResources().getColor(R.color.black)); } else { + // this is a public key - show if it's verified if (isVerified) { - if (cursor.getInt(KeyListFragment.INDEX_HAS_ANY_SECRET) != 0) { - // this is a secret key - h.mStatus.setVisibility(View.GONE); - } else { - // this is a public key - show if it's verified - KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, KeyFormattingUtils.STATE_VERIFIED); - h.mStatus.setVisibility(View.VISIBLE); - } + KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, KeyFormattingUtils.STATE_VERIFIED); + h.mStatus.setVisibility(View.VISIBLE); } else { - h.mStatus.setVisibility(View.GONE); + KeyFormattingUtils.setStatusImage(getActivity(), h.mStatus, KeyFormattingUtils.STATE_UNVERIFIED); + h.mStatus.setVisibility(View.VISIBLE); } h.mSlinger.setVisibility(View.GONE); + h.mMainUserId.setTextColor(context.getResources().getColor(R.color.black)); + h.mMainUserIdRest.setTextColor(context.getResources().getColor(R.color.black)); } } @@ -867,7 +871,7 @@ public class KeyListFragment extends LoaderFragment return; } - if ( ! result.success()) { + if (!result.success()) { result.createNotify(activity).show(); return; } |