moparisthebest
/
open-keychain
mirror of https://github.com/moparisthebest/open-keychain
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1142 from tdjogi010/development 

Preselected Suitable Key
This commit is contained in:
Dominik Schürmann 2015-03-15 15:56:12 +01:00
parent 8a2bd80d40 da3540805e
commit ff60e80d42
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java
View File

@ -93,11 +93,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());
}
}
}