diff options
author | Chung-yih Wang <cywang@google.com> | 2009-06-11 07:57:48 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-11 07:57:48 -0700 |
commit | 24b17de66cceaf0b5e62ceb6bb0131d16bf6063c (patch) | |
tree | 7165519f44339e8b7a2f6ccb9e74c5b0d4c0b04e /src/com/android/settings/wifi/AccessPointDialog.java | |
parent | 17f69c88f5e852aa5152b9076225adf19e6ac048 (diff) | |
parent | e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0 (diff) | |
download | packages_apps_Settings-24b17de66cceaf0b5e62ceb6bb0131d16bf6063c.tar.gz packages_apps_Settings-24b17de66cceaf0b5e62ceb6bb0131d16bf6063c.tar.bz2 packages_apps_Settings-24b17de66cceaf0b5e62ceb6bb0131d16bf6063c.zip |
am e7e587da: Revert "Use the keystore service instead of the direct file acess."
Merge commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0'
* commit 'e7e587daf65ec39ca2b10e5c6a03f6bb0b4ccce0':
Revert "Use the keystore service instead of the direct file acess."
Diffstat (limited to 'src/com/android/settings/wifi/AccessPointDialog.java')
-rw-r--r-- | src/com/android/settings/wifi/AccessPointDialog.java | 57 |
1 files changed, 18 insertions, 39 deletions
diff --git a/src/com/android/settings/wifi/AccessPointDialog.java b/src/com/android/settings/wifi/AccessPointDialog.java index a56f5826c..aab4d1ab2 100644 --- a/src/com/android/settings/wifi/AccessPointDialog.java +++ b/src/com/android/settings/wifi/AccessPointDialog.java @@ -22,7 +22,6 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.res.Resources; -import android.security.Keystore; import android.net.wifi.WifiInfo; import android.net.wifi.WifiManager; import android.os.Bundle; @@ -80,8 +79,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On AccessPointState.WEP_PASSWORD_AUTO, AccessPointState.WEP_PASSWORD_ASCII, AccessPointState.WEP_PASSWORD_HEX }; - private static final String NOT_APPLICABLE = "N/A"; - + // Button positions, default to impossible values private int mConnectButtonPos = Integer.MAX_VALUE; private int mForgetButtonPos = Integer.MAX_VALUE; @@ -132,13 +130,11 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On private TextView mSecurityText; private Spinner mSecuritySpinner; private Spinner mWepTypeSpinner; - private Keystore mKeystore; public AccessPointDialog(Context context, WifiLayer wifiLayer) { super(context); mWifiLayer = wifiLayer; - mKeystore = Keystore.getInstance(); } @Override @@ -329,34 +325,19 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On setEnterpriseFields(view); mEapSpinner.setSelection(getSelectionIndex( R.array.wifi_eap_entries, mState.getEap())); + Keystore ks = Keystore.getInstance(); mClientCertSpinner.setSelection(getSelectionIndex( - getAllCertificateKeys(), mState.getEnterpriseField( + ks.getAllCertificateKeys(), mState.getEnterpriseField( AccessPointState.CLIENT_CERT))); mCaCertSpinner.setSelection(getSelectionIndex( - getAllCertificateKeys(), mState.getEnterpriseField( + ks.getAllCertificateKeys(), mState.getEnterpriseField( AccessPointState.CA_CERT))); mPrivateKeySpinner.setSelection(getSelectionIndex( - getAllUserkeyKeys(), mState.getEnterpriseField( + ks.getAllUserkeyKeys(), mState.getEnterpriseField( AccessPointState.PRIVATE_KEY))); } } - private String[] getAllCertificateKeys() { - return appendEmptyInSelection(mKeystore.getAllCertificateKeys()); - } - - private String[] getAllUserkeyKeys() { - return appendEmptyInSelection(mKeystore.getAllUserkeyKeys()); - } - - private String[] appendEmptyInSelection(String[] keys) { - if (keys.length == 0) return keys; - String[] selections = new String[keys.length + 1]; - System.arraycopy(keys, 0, selections, 0, keys.length); - selections[keys.length] = NOT_APPLICABLE; - return selections; - } - private void setEnterpriseFields(View view) { mIdentityText = (TextView) view.findViewById(R.id.identity_text); mIdentityEdit = (EditText) view.findViewById(R.id.identity_edit); @@ -384,24 +365,26 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On mPhase2Spinner.setPromptId(R.string.please_select_phase2); setSpinnerAdapter(mPhase2Spinner, R.array.wifi_phase2_entries); + Keystore ks = Keystore.getInstance(); + mClientCertSpinner = (Spinner) view.findViewById(R.id.client_certificate_spinner); mClientCertSpinner.setOnItemSelectedListener(this); mClientCertSpinner.setPromptId( R.string.please_select_client_certificate); - setSpinnerAdapter(mClientCertSpinner, getAllCertificateKeys()); + setSpinnerAdapter(mClientCertSpinner, ks.getAllCertificateKeys()); mCaCertSpinner = (Spinner) view.findViewById(R.id.ca_certificate_spinner); mCaCertSpinner.setOnItemSelectedListener(this); mCaCertSpinner.setPromptId(R.string.please_select_ca_certificate); - setSpinnerAdapter(mCaCertSpinner, getAllCertificateKeys()); + setSpinnerAdapter(mCaCertSpinner, ks.getAllCertificateKeys()); mPrivateKeySpinner = (Spinner) view.findViewById(R.id.private_key_spinner); mPrivateKeySpinner.setOnItemSelectedListener(this); mPrivateKeySpinner.setPromptId(R.string.please_select_private_key); - setSpinnerAdapter(mPrivateKeySpinner, getAllUserkeyKeys()); + setSpinnerAdapter(mPrivateKeySpinner, ks.getAllUserkeyKeys()); mEnterpriseTextFields = new EditText[] { mIdentityEdit, mAnonymousIdentityEdit, mPrivateKeyPasswdEdit @@ -656,6 +639,7 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On private void updateEnterpriseFields(int securityType) { int i; + Keystore ks = Keystore.getInstance(); for (i = AccessPointState.IDENTITY ; i < AccessPointState.MAX_ENTRPRISE_FIELD ; i++) { String value; @@ -664,21 +648,16 @@ public class AccessPointDialog extends AlertDialog implements DialogInterface.On } else { Spinner spinner = mEnterpriseSpinnerFields[i - AccessPointState.CLIENT_CERT]; - int index = spinner.getSelectedItemPosition(); - if (index == (spinner.getCount() - 1)) { - value = ""; + + if (i != AccessPointState.PRIVATE_KEY) { + value = ks.getCertificate(ks.getAllCertificateKeys() + [spinner.getSelectedItemPosition()]); } else { - if (i != AccessPointState.PRIVATE_KEY) { - value = mKeystore.getCertificate( - getAllCertificateKeys()[index]); - } else { - value = mKeystore.getUserkey( - getAllUserkeyKeys()[index]); - } + value = ks.getUserkey(ks.getAllUserkeyKeys() + [spinner.getSelectedItemPosition()]); } } - if (!TextUtils.isEmpty(value) || - (i == AccessPointState.PRIVATE_KEY_PASSWD)) { + if (!TextUtils.isEmpty(value)) { mState.setEnterpriseField(i, value); } } |