Allow domain suffix match to be set in UI for EAP configurations (3848ddc1) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_dialog.xml

+18 −0

Original line number	Diff line number	Diff line
		@@ -157,6 +157,24 @@
		android:text="@string/wifi_do_not_validate_eap_server_warning" />
		</LinearLayout>

		<LinearLayout android:id="@+id/l_domain"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item" >
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/wifi_item_label"
		android:text="@string/wifi_eap_domain" />

		<EditText android:id="@+id/domain"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		style="@style/wifi_item_edit_content"
		android:singleLine="true"
		android:inputType="textNoSuggestions" />
		</LinearLayout>

		<LinearLayout android:id="@+id/l_user_cert"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -1616,6 +1616,8 @@
		<string name="please_select_phase2">Phase 2 authentication</string>
		<!-- Label for the EAP CA certificate of the network -->
		<string name="wifi_eap_ca_cert">CA certificate</string>
		<!-- Label for the domain name that the EAP CA certificate(s) can be used to validate. -->
		<string name="wifi_eap_domain">Domain</string>
		<!-- Label for the EAP user certificate of the network -->
		<string name="wifi_eap_user_cert">User certificate</string>
		<!-- Label for the EAP identity of the network -->

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

+38 −11

Original line number	Diff line number	Diff line
		@@ -127,6 +127,7 @@ public class WifiConfigController implements TextWatcher,
		private Spinner mSecuritySpinner;
		private Spinner mEapMethodSpinner;
		private Spinner mEapCaCertSpinner;
		private TextView mEapDomainView;
		private Spinner mPhase2Spinner;
		// Associated with mPhase2Spinner, one of mPhase2FullAdapter or mPhase2PeapAdapter
		private ArrayAdapter<String> mPhase2Adapter;
		@@ -514,10 +515,14 @@ public class WifiConfigController implements TextWatcher,
		// Note: \|caCert\| should not be able to take the value \|unspecifiedCert\|,
		// since we prevent such configurations from being saved.
		config.enterpriseConfig.setCaCertificateAliases(null);
		} else if (caCert.equals(mMultipleCertSetString)) {
		} else {
		config.enterpriseConfig.setDomainSuffixMatch(
		mEapDomainView.getText().toString());
		if (caCert.equals(mMultipleCertSetString)) {
		if (mAccessPoint != null) {
		if (!mAccessPoint.isSaved()) {
		Log.e(TAG, "Multiple certs can only be set when editing saved network");
		Log.e(TAG, "Multiple certs can only be set "
		+ "when editing saved network");
		}
		config.enterpriseConfig.setCaCertificateAliases(
		mAccessPoint.getConfig().enterpriseConfig
		@@ -526,6 +531,7 @@ public class WifiConfigController implements TextWatcher,
		} else {
		config.enterpriseConfig.setCaCertificateAliases(new String[] {caCert});
		}
		}

		String clientCert = (String) mEapUserCertSpinner.getSelectedItem();
		if (clientCert.equals(mUnspecifiedCertString)
		@@ -738,6 +744,7 @@ public class WifiConfigController implements TextWatcher,
		mPhase2Spinner = (Spinner) mView.findViewById(R.id.phase2);
		mEapCaCertSpinner = (Spinner) mView.findViewById(R.id.ca_cert);
		mEapCaCertSpinner.setOnItemSelectedListener(this);
		mEapDomainView = (TextView) mView.findViewById(R.id.domain);
		mEapUserCertSpinner = (Spinner) mView.findViewById(R.id.user_cert);
		mEapUserCertSpinner.setOnItemSelectedListener(this);
		mEapIdentityView = (TextView) mView.findViewById(R.id.identity);
		@@ -787,6 +794,7 @@ public class WifiConfigController implements TextWatcher,
		Credentials.CA_CERTIFICATE, true, mDoNotValidateEapServerString);
		mEapCaCertSpinner.setSelection(MULTIPLE_CERT_SET_INDEX);
		}
		mEapDomainView.setText(enterpriseConfig.getDomainSuffixMatch());
		setSelection(mEapUserCertSpinner, enterpriseConfig.getClientCertificateAlias());
		mEapIdentityView.setText(enterpriseConfig.getIdentity());
		mEapAnonymousView.setText(enterpriseConfig.getAnonymousIdentity());
		@@ -811,6 +819,7 @@ public class WifiConfigController implements TextWatcher,
		* EAP-TLS valid fields include
		* user_cert
		* ca_cert
		* domain
		* identity
		* EAP-TTLS valid fields include
		* phase2: PAP, MSCHAP, MSCHAPV2, GTC
		@@ -823,6 +832,7 @@ public class WifiConfigController implements TextWatcher,
		// Common defaults
		mView.findViewById(R.id.l_method).setVisibility(View.VISIBLE);
		mView.findViewById(R.id.l_identity).setVisibility(View.VISIBLE);
		mView.findViewById(R.id.l_domain).setVisibility(View.VISIBLE);

		// Defaults for most of the EAP methods and over-riden by
		// by certain EAP methods
		@@ -835,6 +845,7 @@ public class WifiConfigController implements TextWatcher,
		case WIFI_EAP_METHOD_PWD:
		setPhase2Invisible();
		setCaCertInvisible();
		setDomainInvisible();
		setAnonymousIdentInvisible();
		setUserCertInvisible();
		break;
		@@ -870,11 +881,22 @@ public class WifiConfigController implements TextWatcher,
		setPhase2Invisible();
		setAnonymousIdentInvisible();
		setCaCertInvisible();
		setDomainInvisible();
		setUserCertInvisible();
		setPasswordInvisible();
		setIdentityInvisible();
		break;
		}

		if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
		String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
		if (eapCertSelection.equals(mDoNotValidateEapServerString)
		\|\| eapCertSelection.equals(mUnspecifiedCertString)) {
		// Domain suffix matching is not relevant if the user hasn't chosen a CA
		// certificate yet, or chooses not to validate the EAP server.
		setDomainInvisible();
		}
		}
		}

		private void setIdentityInvisible() {
		@@ -892,6 +914,11 @@ public class WifiConfigController implements TextWatcher,
		mEapCaCertSpinner.setSelection(UNSPECIFIED_CERT_INDEX);
		}

		private void setDomainInvisible() {
		mView.findViewById(R.id.l_domain).setVisibility(View.GONE);
		mEapDomainView.setText("");
		}

		private void setUserCertInvisible() {
		mView.findViewById(R.id.l_user_cert).setVisibility(View.GONE);
		mEapUserCertSpinner.setSelection(UNSPECIFIED_CERT_INDEX);
		@@ -1120,7 +1147,7 @@ public class WifiConfigController implements TextWatcher,
		if (parent == mSecuritySpinner) {
		mAccessPointSecurity = position;
		showSecurityFields();
		} else if (parent == mEapMethodSpinner) {
		} else if (parent == mEapMethodSpinner \|\| parent == mEapCaCertSpinner) {
		showSecurityFields();
		} else if (parent == mProxySettingsSpinner) {
		showProxyFields();