aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent <valodim@mugenguild.com>2016-04-06 15:31:22 +0200
committerVincent <valodim@mugenguild.com>2016-04-06 15:31:22 +0200
commitd0a424f9f273f5a651c910ac24c934e523d5f737 (patch)
tree19a7afd189da6867c134c444e195a0b8a5a0996e
parent77678886fcb2a2666a6017f5b6b5e33f23ae551a (diff)
parentaec4744b31b74e697a147b30a3eda2f5b381c9e2 (diff)
downloadopen-keychain-d0a424f9f273f5a651c910ac24c934e523d5f737.tar.gz
open-keychain-d0a424f9f273f5a651c910ac24c934e523d5f737.tar.bz2
open-keychain-d0a424f9f273f5a651c910ac24c934e523d5f737.zip
Merge pull request #1818 from 007durgesh219/Issue#1468
Fix Unusable signing key not properly disabled, Issue #1468
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java5
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java5
2 files changed, 0 insertions, 10 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
index 6a51085f3..63afb1e8b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
@@ -113,11 +113,6 @@ public class CertifyKeySpinner extends KeySpinner {
@Override
boolean isItemEnabled(Cursor cursor) {
- // "none" entry is always enabled!
- if (cursor.getPosition() == 0) {
- return true;
- }
-
if (cursor.getInt(KeyAdapter.INDEX_IS_REVOKED) != 0) {
return false;
}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java
index 8fb9e38aa..0c2d93ad9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java
@@ -72,11 +72,6 @@ public class SignKeySpinner extends KeySpinner {
@Override
boolean isItemEnabled(Cursor cursor) {
- // "none" entry is always enabled!
- if (cursor.getPosition() == 0) {
- return true;
- }
-
if (cursor.getInt(KeyAdapter.INDEX_IS_REVOKED) != 0) {
return false;
}