commit 6231655e013d4a1d70c19d4a6e3725c1fdd2d55e
author Brian Carlstrom <bdc@google.com> Sun Jul 10 12:26:12 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sun Jul 10 12:26:22 2011 -0700
tree bbd7c93d232e159597b63db66a0b8975a98f987c
parent 7d9aa755e504029fbfb8f0c47d8705490bcdf624

If only one certificate available, select it by default

Change-Id: I4635b6f30c95e00182f4705748cbdf1ee136272a

src/com/android/keychain/KeyChainActivity.java

diff --git a/src/com/android/keychain/KeyChainActivity.java b/src/com/android/keychain/KeyChainActivity.java
index 80be9e9..9b08761 100644
--- a/src/com/android/keychain/KeyChainActivity.java
+++ b/src/com/android/keychain/KeyChainActivity.java
@@ -160,11 +160,17 @@
             title = res.getString(R.string.title_select_cert);
             String alias = getIntent().getStringExtra(KeyChain.EXTRA_ALIAS);
             if (alias != null) {
+                // if alias was requested, set it if found
                 int adapterPosition = adapter.mAliases.indexOf(alias);
                 if (adapterPosition != -1) {
                     int listViewPosition = adapterPosition+1;
                     lv.setItemChecked(listViewPosition, true);
                 }
+            } else if (adapter.mAliases.size() == 1) {
+                // if only one choice, preselect it
+                int adapterPosition = 0;
+                int listViewPosition = adapterPosition+1;
+                lv.setItemChecked(listViewPosition, true);
             }
 
             builder.setPositiveButton(R.string.allow_button, new DialogInterface.OnClickListener() {