From f91457e07fd3f38ba5cd4d07bb0b708a3a5beb17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Tue, 6 May 2014 15:04:09 +0200 Subject: Touch view only once --- .../keychain/ui/ViewKeyMainFragment.java | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java index 46c726ac3..ded457eca 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java @@ -204,26 +204,28 @@ public class ViewKeyMainFragment extends Fragment implements mActionEditDivider.setVisibility(View.GONE); } - // It's easier to reset to defaults beforehand, saves some nasty else clauses - mStatusRevoked.setVisibility(View.GONE); - mStatusExpired.setVisibility(View.GONE); - mActionCertify.setEnabled(true); - mActionEdit.setEnabled(true); - mActionEncrypt.setEnabled(true); - // If this key is revoked, it cannot be used for anything! if (data.getInt(INDEX_UNIFIED_IS_REVOKED) != 0) { mStatusRevoked.setVisibility(View.VISIBLE); - mActionCertify.setEnabled(false); + mStatusExpired.setVisibility(View.GONE); + mActionEdit.setEnabled(false); + mActionCertify.setEnabled(false); mActionEncrypt.setEnabled(false); } else { + mActionEdit.setEnabled(true); + Date expiryDate = new Date(data.getLong(INDEX_UNIFIED_EXPIRY) * 1000); if (!data.isNull(INDEX_UNIFIED_EXPIRY) && expiryDate.before(new Date())) { + mStatusRevoked.setVisibility(View.GONE); mStatusExpired.setVisibility(View.VISIBLE); mActionCertify.setEnabled(false); mActionEncrypt.setEnabled(false); - // mActionEdit is still fine + } else { + mStatusRevoked.setVisibility(View.GONE); + mStatusExpired.setVisibility(View.GONE); + mActionCertify.setEnabled(true); + mActionEncrypt.setEnabled(true); } } -- cgit v1.2.3