Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e503825 authored by Samuel Tan's avatar Samuel Tan Committed by android-build-merger
Browse files

Correctly load saved EAP CA cert and user cert options 

am: 3d8cdb10

* commit '3d8cdb10':
  Correctly load saved EAP CA cert and user cert options
parents c69f2be4 3d8cdb10

src/com/android/settings/wifi/WifiConfigController.java

+7 −2
Original line number Original line Diff line number Diff line
@@ -785,7 +785,7 @@ public class WifiConfigController implements TextWatcher, 
                }

                }

                String[] caCerts = enterpriseConfig.getCaCertificateAliases();

                String[] caCerts = enterpriseConfig.getCaCertificateAliases();

                if (caCerts == null) {

                if (caCerts == null) {

                    setSelection(mEapCaCertSpinner, mUnspecifiedCertString);

                    setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);

                } else if (caCerts.length == 1) {

                } else if (caCerts.length == 1) {

                    setSelection(mEapCaCertSpinner, caCerts[0]);

                    setSelection(mEapCaCertSpinner, caCerts[0]);

                } else {

                } else {
@@ -795,7 +795,12 @@ public class WifiConfigController implements TextWatcher, 
                    mEapCaCertSpinner.setSelection(MULTIPLE_CERT_SET_INDEX);

                    mEapCaCertSpinner.setSelection(MULTIPLE_CERT_SET_INDEX);

                }

                }

                mEapDomainView.setText(enterpriseConfig.getDomainSuffixMatch());

                mEapDomainView.setText(enterpriseConfig.getDomainSuffixMatch());

                setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias());

                String userCert = enterpriseConfig.getClientCertificateAlias();

                if (TextUtils.isEmpty(userCert)) {

                    setSelection(mEapUserCertSpinner, mDoNotProvideEapUserCertString);

                } else {

                    setSelection(mEapUserCertSpinner, userCert);

                }

                mEapIdentityView.setText(enterpriseConfig.getIdentity());

                mEapIdentityView.setText(enterpriseConfig.getIdentity());

                mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());

                mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());

            } else {

            } else {