From 730f820c8c6edbf5a86bb7a1389b5d52ca07bba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 28 Jul 2014 11:17:12 +0200 Subject: [PATCH] Set visibility at last --- .../org/sufficientlysecure/keychain/ui/KeyListFragment.java | 6 +++--- .../org/sufficientlysecure/keychain/ui/ViewKeyActivity.java | 6 +++--- 2 files changed, 6 insertions(+), 6 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 ee05a5fe4..5c74b6602 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java @@ -492,23 +492,23 @@ public class KeyListFragment extends LoaderFragment // Note: order is important! if (isRevoked) { - h.mStatus.setVisibility(View.VISIBLE); h.mStatus.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_revoked)); h.mStatus.setColorFilter(getResources().getColor(R.color.result_red), PorterDuff.Mode.SRC_ATOP); - } else if (isExpired) { h.mStatus.setVisibility(View.VISIBLE); + } else if (isExpired) { h.mStatus.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_expired)); h.mStatus.setColorFilter(getResources().getColor(R.color.result_orange), PorterDuff.Mode.SRC_ATOP); - } else if (isVerified) { h.mStatus.setVisibility(View.VISIBLE); + } else if (isVerified) { h.mStatus.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_verified)); h.mStatus.setColorFilter(getResources().getColor(R.color.result_green), PorterDuff.Mode.SRC_ATOP); + h.mStatus.setVisibility(View.VISIBLE); } else { h.mStatus.setVisibility(View.GONE); } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 8407ab66d..d18a63948 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java @@ -528,23 +528,23 @@ public class ViewKeyActivity extends ActionBarActivity implements // Note: order is important if (isRevoked) { - mStatusDivider.setVisibility(View.VISIBLE); - mStatusLayout.setVisibility(View.VISIBLE); mStatusText.setText(R.string.view_key_revoked); mStatusText.setTextColor(getResources().getColor(R.color.result_red)); mStatusImage.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_revoked)); mStatusImage.setColorFilter(getResources().getColor(R.color.result_red), PorterDuff.Mode.SRC_ATOP); - } else if (isExpired) { mStatusDivider.setVisibility(View.VISIBLE); mStatusLayout.setVisibility(View.VISIBLE); + } else if (isExpired) { mStatusText.setText(R.string.view_key_expired); mStatusText.setTextColor(getResources().getColor(R.color.result_orange)); mStatusImage.setImageDrawable( getResources().getDrawable(R.drawable.status_signature_expired_cutout)); mStatusImage.setColorFilter(getResources().getColor(R.color.result_orange), PorterDuff.Mode.SRC_ATOP); + mStatusDivider.setVisibility(View.VISIBLE); + mStatusLayout.setVisibility(View.VISIBLE); } else { mStatusDivider.setVisibility(View.GONE); mStatusLayout.setVisibility(View.GONE);