From ad8209bd9425c71e21d3c43c2520bd57957115d7 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 26 Feb 2015 10:48:17 +0100 Subject: [PATCH] pre-select certification key if only one is available --- .../keychain/ui/widget/CertifyKeySpinner.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 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 25033658d..6d0e6556f 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 @@ -86,16 +86,17 @@ public class CertifyKeySpinner extends KeySpinner { super.onLoadFinished(loader, data); if (loader.getId() == LOADER_ID) { - // If there is only one choice, pick it by default - if (mAdapter.getCount() == 2) { - // preselect if key can certify - if (data.moveToPosition(1) && !data.isNull(mIndexHasCertify)) { - setSelection(1); - } - } mIndexHasCertify = data.getColumnIndex(KeychainContract.KeyRings.HAS_CERTIFY); 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) { + // preselect if key can certify + if (data.moveToPosition(0) && !data.isNull(mIndexHasCertify)) { + setSelection(1); + } + } } }