From be4882f5c117e8c1fa64ac77970571c680652700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 13 Sep 2014 20:53:07 +0200 Subject: [PATCH] If expired/revoked, disable both encrypt buttons --- .../sufficientlysecure/keychain/ui/ViewKeyMainFragment.java | 3 +++ 1 file changed, 3 insertions(+) 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 e4b455481..de4d7fa42 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java @@ -235,6 +235,7 @@ public class ViewKeyMainFragment extends LoaderFragment implements mActionEdit.setEnabled(false); mActionCertify.setEnabled(false); mActionCertifyText.setEnabled(false); + mActionEncryptText.setEnabled(false); mActionEncryptFiles.setEnabled(false); } else { mActionEdit.setEnabled(true); @@ -243,10 +244,12 @@ public class ViewKeyMainFragment extends LoaderFragment implements if (!data.isNull(INDEX_UNIFIED_EXPIRY) && expiryDate.before(new Date())) { mActionCertify.setEnabled(false); mActionCertifyText.setEnabled(false); + mActionEncryptText.setEnabled(false); mActionEncryptFiles.setEnabled(false); } else { mActionCertify.setEnabled(true); mActionCertifyText.setEnabled(true); + mActionEncryptText.setEnabled(true); mActionEncryptFiles.setEnabled(true); } }