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

Merge "Use updated enterprise API"

Browse Source
This commit is contained in:
Irfan Sheriff
2013-02-12 22:57:14 +00:00
committed by Android (Google) Code Review
parent 6a5b50a6c3 c577427b55
commit 7bb10dbca5
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,10 +395,10 @@ public class WifiConfigController implements TextWatcher,
} }
String caCert = (String) mEapCaCertSpinner.getSelectedItem(); String caCert = (String) mEapCaCertSpinner.getSelectedItem();
if (caCert.equals(unspecifiedCert)) caCert = ""; if (caCert.equals(unspecifiedCert)) caCert = "";
config.enterpriseConfig.setCaCertificate(caCert); config.enterpriseConfig.setCaCertificateAlias(caCert);
String clientCert = (String) mEapUserCertSpinner.getSelectedItem(); String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
if (clientCert.equals(unspecifiedCert)) clientCert = ""; if (clientCert.equals(unspecifiedCert)) clientCert = "";
config.enterpriseConfig.setClientCertificate(clientCert); config.enterpriseConfig.setClientCertificateAlias(clientCert);
config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString()); config.enterpriseConfig.setIdentity(mEapIdentityView.getText().toString());
config.enterpriseConfig.setAnonymousIdentity( config.enterpriseConfig.setAnonymousIdentity(
mEapAnonymousView.getText().toString()); mEapAnonymousView.getText().toString());
@@ -582,9 +582,9 @@ public class WifiConfigController implements TextWatcher,
// Modifying an existing network // Modifying an existing network
if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) { if (mAccessPoint != null && mAccessPoint.networkId != INVALID_NETWORK_ID) {
WifiConfiguration config = mAccessPoint.getConfig(); WifiEnterpriseConfig enterpriseConfig = mAccessPoint.getConfig().enterpriseConfig;
int eapMethod = config.enterpriseConfig.getEapMethod(); int eapMethod = enterpriseConfig.getEapMethod();
int phase2Method = config.enterpriseConfig.getPhase2Method(); int phase2Method = enterpriseConfig.getPhase2Method();
mEapMethodSpinner.setSelection(eapMethod); mEapMethodSpinner.setSelection(eapMethod);
showEapFieldsByMethod(eapMethod); showEapFieldsByMethod(eapMethod);
switch (eapMethod) { switch (eapMethod) {
@@ -608,10 +608,10 @@ public class WifiConfigController implements TextWatcher,
mPhase2Spinner.setSelection(phase2Method); mPhase2Spinner.setSelection(phase2Method);
break; break;
} }
setSelection(mEapCaCertSpinner, config.enterpriseConfig.getCaCertificate()); setSelection(mEapCaCertSpinner, enterpriseConfig.getCaCertificateAlias());
setSelection(mEapUserCertSpinner, config.enterpriseConfig.getClientCertificate()); setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias());
mEapIdentityView.setText(config.enterpriseConfig.getIdentity()); mEapIdentityView.setText(enterpriseConfig.getIdentity());
mEapAnonymousView.setText(config.enterpriseConfig.getAnonymousIdentity()); mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());
} else { } else {
// Choose a default for a new network and show only appropriate // Choose a default for a new network and show only appropriate
// fields // fields