PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update Wifi to use new keystore function"

Browse Source
This commit is contained in:
Kenny Root
2012-03-27 20:41:40 -07:00
committed by Android (Google) Code Review
parent 8ce45a6ccc 4786b261d3
commit 66ada107ef
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/wifi/WifiConfigController.java
View File

@@ -63,7 +63,7 @@ import java.util.Iterator;
*/ */
public class WifiConfigController implements TextWatcher, public class WifiConfigController implements TextWatcher,
View.OnClickListener, AdapterView.OnItemSelectedListener { View.OnClickListener, AdapterView.OnItemSelectedListener {
private static final String KEYSTORE_SPACE = "keystore://"; private static final String KEYSTORE_SPACE = WifiConfiguration.KEYSTORE_URI;
private final WifiConfigUiBase mConfigUi; private final WifiConfigUiBase mConfigUi;
private final View mView; private final View mView;
@@ -126,8 +126,10 @@ public class WifiConfigController implements TextWatcher,
if (config == null) { if (config == null) {
return false; return false;
} }
String values[] = {config.ca_cert.value(), config.client_cert.value(), if (config.key_id.value() != null) {
config.private_key.value()}; return true;
}
String values[] = { config.ca_cert.value(), config.client_cert.value() };
for (String value : values) { for (String value : values) {
if (value != null && value.startsWith(KEYSTORE_SPACE)) { if (value != null && value.startsWith(KEYSTORE_SPACE)) {
return true; return true;
@@ -362,8 +364,10 @@ public class WifiConfigController implements TextWatcher,
config.client_cert.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ? config.client_cert.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
"" : KEYSTORE_SPACE + Credentials.USER_CERTIFICATE + "" : KEYSTORE_SPACE + Credentials.USER_CERTIFICATE +
(String) mEapUserCertSpinner.getSelectedItem()); (String) mEapUserCertSpinner.getSelectedItem());
config.private_key.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ? config.engine.setValue(WifiConfiguration.ENGINE_ENABLE);
"" : KEYSTORE_SPACE + Credentials.USER_PRIVATE_KEY + config.engine_id.setValue(WifiConfiguration.KEYSTORE_ENGINE_ID);
config.key_id.setValue((mEapUserCertSpinner.getSelectedItemPosition() == 0) ?
"" : Credentials.USER_PRIVATE_KEY +
(String) mEapUserCertSpinner.getSelectedItem()); (String) mEapUserCertSpinner.getSelectedItem());
config.identity.setValue((mEapIdentityView.length() == 0) ? "" : config.identity.setValue((mEapIdentityView.length() == 0) ? "" :
mEapIdentityView.getText().toString()); mEapIdentityView.getText().toString());
@@ -544,10 +548,10 @@ public class WifiConfigController implements TextWatcher,
WifiConfiguration config = mAccessPoint.getConfig(); WifiConfiguration config = mAccessPoint.getConfig();
setSelection(mEapMethodSpinner, config.eap.value()); setSelection(mEapMethodSpinner, config.eap.value());
setSelection(mPhase2Spinner, config.phase2.value()); setSelection(mPhase2Spinner, config.phase2.value());
setCertificate(mEapCaCertSpinner, Credentials.CA_CERTIFICATE, setCertificate(mEapCaCertSpinner, KEYSTORE_SPACE + Credentials.CA_CERTIFICATE,
config.ca_cert.value()); config.ca_cert.value());
setCertificate(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY, setCertificate(mEapUserCertSpinner, Credentials.USER_PRIVATE_KEY,
config.private_key.value()); config.key_id.value());
mEapIdentityView.setText(config.identity.value()); mEapIdentityView.setText(config.identity.value());
mEapAnonymousView.setText(config.anonymous_identity.value()); mEapAnonymousView.setText(config.anonymous_identity.value());
} }
@@ -680,7 +684,6 @@ public class WifiConfigController implements TextWatcher,
} }
private void setCertificate(Spinner spinner, String prefix, String cert) { private void setCertificate(Spinner spinner, String prefix, String cert) {
prefix = KEYSTORE_SPACE + prefix;
if (cert != null && cert.startsWith(prefix)) { if (cert != null && cert.startsWith(prefix)) {
setSelection(spinner, cert.substring(prefix.length())); setSelection(spinner, cert.substring(prefix.length()));
} }