diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-28 11:17:12 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-07-28 11:17:12 +0200 |
| commit | 730f820c8c6edbf5a86bb7a1389b5d52ca07bba3 (patch) | |
| tree | 818a4cdf323d66df16b59dbcc51a64692769e6c2 /OpenKeychain | |
| parent | 3d6edd11903898b8dc95a52d26b8dc3716d85e49 (diff) | |
| download | open-keychain-730f820c8c6edbf5a86bb7a1389b5d52ca07bba3.tar.gz open-keychain-730f820c8c6edbf5a86bb7a1389b5d52ca07bba3.tar.bz2 open-keychain-730f820c8c6edbf5a86bb7a1389b5d52ca07bba3.zip | |
Set visibility at last
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java | 6 | ||||
| -rw-r--r-- | OpenKeychain/src/main/java/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); |