diff options
author | tdjogi010@gmail.com <tejasJOGI2@> | 2015-03-12 20:59:05 +0530 |
---|---|---|
committer | tdjogi010@gmail.com <tejasJOGI2@> | 2015-03-13 11:06:13 +0530 |
commit | d56c90ce76236d94b14510d76cbb01bfad71d34f (patch) | |
tree | c077244dedd0e27b1f8d6a67c89ee0569b7d0e41 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain | |
parent | 9ff4d7b2bc0830e96c7d844f2ffc7d5da798b646 (diff) | |
download | open-keychain-d56c90ce76236d94b14510d76cbb01bfad71d34f.tar.gz open-keychain-d56c90ce76236d94b14510d76cbb01bfad71d34f.tar.bz2 open-keychain-d56c90ce76236d94b14510d76cbb01bfad71d34f.zip |
Preselected Suitable Key
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java | 14 |
1 files changed, 10 insertions, 4 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 fc912fccb..6dd254aa1 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 @@ -91,11 +91,17 @@ public class CertifyKeySpinner extends KeySpinner { mIndexIsRevoked = data.getColumnIndex(KeychainContract.KeyRings.IS_REVOKED); mIndexIsExpired = data.getColumnIndex(KeychainContract.KeyRings.IS_EXPIRED); - // If there is only one choice, pick it by default - if (mAdapter.getCount() == 2) { + // If there is more than one choice, pick a key + if (mAdapter.getCount() >= 2) { // preselect if key can certify - if (data.moveToPosition(0) && !data.isNull(mIndexHasCertify)) { - setSelection(1); + if (data.moveToPosition(0)) { + do { + if (!data.isNull(mIndexHasCertify)) { + setSelection(data.getPosition() + 1); + break; + } + } + while (data.moveToNext()); } } } |