aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 20:53:07 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 20:53:07 +0200
commitbe4882f5c117e8c1fa64ac77970571c680652700 (patch)
tree32cc6a6ae7f0bbdb248c50f84422555e985e197c
parent143cd2bd1359a25ffc0086ffa7ed8e49a99d421f (diff)
downloadopen-keychain-be4882f5c117e8c1fa64ac77970571c680652700.tar.gz
open-keychain-be4882f5c117e8c1fa64ac77970571c680652700.tar.bz2
open-keychain-be4882f5c117e8c1fa64ac77970571c680652700.zip
If expired/revoked, disable both encrypt buttons
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java3
1 files changed, 3 insertions, 0 deletions
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);
}
}