From a29d6b0ef3a09693478d89cd298f331089d71ab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Sat, 4 Oct 2014 15:42:23 +0200 Subject: Import code, fix collision of key spinner with other loaders --- .../keychain/ui/widget/CertifyKeySpinner.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java') 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 07f6529f1..29273300a 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 @@ -84,13 +84,16 @@ public class CertifyKeySpinner extends KeySpinner { @Override public void onLoadFinished(Loader loader, Cursor data) { super.onLoadFinished(loader, data); - // If there is only one choice, pick it by default - if (mAdapter.getCount() == 2) { - setSelection(1); + + if (loader.getId() == LOADER_ID) { + // If there is only one choice, pick it by default + if (mAdapter.getCount() == 2) { + setSelection(1); + } + mIndexHasCertify = data.getColumnIndex(KeychainContract.KeyRings.HAS_CERTIFY); + mIndexIsRevoked = data.getColumnIndex(KeychainContract.KeyRings.IS_REVOKED); + mIndexIsExpired = data.getColumnIndex(KeychainContract.KeyRings.IS_EXPIRED); } - mIndexHasCertify = data.getColumnIndex(KeychainContract.KeyRings.HAS_CERTIFY); - mIndexIsRevoked = data.getColumnIndex(KeychainContract.KeyRings.IS_REVOKED); - mIndexIsExpired = data.getColumnIndex(KeychainContract.KeyRings.IS_EXPIRED); } @Override -- cgit v1.2.3