From ead7597afc95706b04430e9b4171acdfa3ca4fef Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <valodim@mugenguild.com>
Date: Fri, 24 Apr 2015 15:44:53 +0200
Subject: don't show key spinner for a single entry

---
 .../keychain/ui/linked/LinkedIdViewFragment.java                   | 4 +++-
 .../sufficientlysecure/keychain/ui/widget/CertifyKeySpinner.java   | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui')

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
index 152cb8988..f618181c6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
@@ -298,7 +298,9 @@ public class LinkedIdViewFragment extends CryptoOperationFragment implements
                     vProgress.setDisplayedChild(1);
                     if (!isSecret) {
                         showButton(2);
-                        vKeySpinnerContainer.setVisibility(View.VISIBLE);
+                        if (!vKeySpinner.isSingleEntry()) {
+                            vKeySpinnerContainer.setVisibility(View.VISIBLE);
+                        }
                     } else {
                         showButton(1);
                         vKeySpinnerContainer.setVisibility(View.GONE);
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 714933b58..e5b3df8c9 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
@@ -36,6 +36,7 @@ import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils.State;
 
 public class CertifyKeySpinner extends KeySpinner {
     private long mHiddenMasterKeyId = Constants.key.none;
+    private boolean mIsSingle;
 
     public CertifyKeySpinner(Context context) {
         super(context);
@@ -99,6 +100,7 @@ public class CertifyKeySpinner extends KeySpinner {
             // - there are actually keys (not just "none" entry)
             // Then:
             // - select key that is capable of certifying, but only if there is only one key capable of it
+            mIsSingle = false;
             if (mSelectedKeyId == Constants.key.none && mAdapter.getCount() > 1) {
                 // preselect if key can certify
                 int selection = -1;
@@ -106,9 +108,11 @@ public class CertifyKeySpinner extends KeySpinner {
                     if (!data.isNull(mIndexHasCertify)) {
                         if (selection == -1) {
                             selection = data.getPosition() + 1;
+                            mIsSingle = true;
                         } else {
                             // if selection is already set, we have more than one certify key!
                             // get back to "none"!
+                            mIsSingle = false;
                             selection = 0;
                         }
                     }
@@ -118,6 +122,9 @@ public class CertifyKeySpinner extends KeySpinner {
         }
     }
 
+    public boolean isSingleEntry() {
+        return mIsSingle && getSelectedItemPosition() != 0;
+    }
 
     @Override
     boolean setStatus(Context context, Cursor cursor, ImageView statusView) {
-- 
cgit v1.2.3