diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-06 17:18:56 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-06 17:19:08 +0200 |
commit | 148867ae866eb7573d39131723a8b1c36d4d8a44 (patch) | |
tree | 3cadb9d0093f0738e2d835c303ac95a148944fa9 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java | |
parent | e172f132e4c2c8f202cb13aaa1da28d654a4353c (diff) | |
download | open-keychain-148867ae866eb7573d39131723a8b1c36d4d8a44.tar.gz open-keychain-148867ae866eb7573d39131723a8b1c36d4d8a44.tar.bz2 open-keychain-148867ae866eb7573d39131723a8b1c36d4d8a44.zip |
actually disable non-enabled items in keyspinner (in keyadapter) (fixes #1366)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SignKeySpinner.java | 7 |
1 files changed, 6 insertions, 1 deletions
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 c59ad7a12..8fb9e38aa 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,13 +72,18 @@ 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; } if (cursor.getInt(KeyAdapter.INDEX_IS_EXPIRED) != 0) { return false; } - if (cursor.getInt(mIndexHasSign) == 0) { + if (cursor.isNull(mIndexHasSign)) { return false; } |