Merge branch 'jacobshack-certify' of github.com:open-keychain/open-keychain into jacobshack-certify

Conflicts:
	OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MultiCertifyKeyFragment.java

1 files changed, 4 insertions, 1 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 29273300a..0a1a1d75b 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
@@ -88,7 +88,10 @@ public class CertifyKeySpinner extends KeySpinner {
         if (loader.getId() == LOADER_ID) {
             // If there is only one choice, pick it by default
             if (mAdapter.getCount() == 2) {
-                setSelection(1);
+                // 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);