Merge remote-tracking branch 'origin/lineage-18.1' into v1-r (c32d27f8) · Commits · e / os / android_packages_apps_Settings

res/layout/wifi_dialog.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,18 @@
		android:entries="@array/eap_ocsp_type" />
		</LinearLayout>

		<LinearLayout android:id="@+id/no_ca_cert_warning"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone"
		style="@style/wifi_item" >
		<TextView
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		style="@style/wifi_item_warning"
		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"

res/values/strings.xml

+2 −0

Original line number	Diff line number	Diff line
		@@ -2143,6 +2143,8 @@
		<string name="wifi_do_not_provide_eap_user_cert">Do not provide</string>
		<!-- Menu option for not validating the EAP server -->
		<string name="wifi_do_not_validate_eap_server">Do not validate</string>
		<!-- Warning message displayed if user choses not to validate the EAP server -->
		<string name="wifi_do_not_validate_eap_server_warning">No certificate specified. Your connection will not be private.</string>
		<!-- Warning message displayed if network name (ssid) is too long -->
		<string name="wifi_ssid_too_long">Network name is too long.</string>
		<!-- Warning message displayed if user does not specify a domain for the CA certificate.

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

+23 −10

Original line number	Diff line number	Diff line
		@@ -163,6 +163,7 @@ public class WifiConfigController implements TextWatcher,
		private String mMultipleCertSetString;
		private String mUseSystemCertsString;
		private String mDoNotProvideEapUserCertString;
		private String mDoNotValidateEapServerString;

		private ScrollView mDialogContainer;
		private Spinner mSecuritySpinner;
		@@ -270,6 +271,8 @@ public class WifiConfigController implements TextWatcher,
		mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
		mDoNotProvideEapUserCertString =
		mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
		mDoNotValidateEapServerString =
		mContext.getString(R.string.wifi_do_not_validate_eap_server);

		mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
		mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
		@@ -558,7 +561,8 @@ public class WifiConfigController implements TextWatcher,
		// Disallow submit if the user has not selected a CA certificate for an EAP network
		// configuration.
		enabled = false;
		} else if (mEapDomainView != null
		} else if (!caCertSelection.equals(mDoNotValidateEapServerString)
		&& mEapDomainView != null
		&& mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
		&& TextUtils.isEmpty(mEapDomainView.getText().toString())) {
		// Disallow submit if the user chooses to use a certificate for EAP server
		@@ -579,6 +583,7 @@ public class WifiConfigController implements TextWatcher,
		}

		void showWarningMessagesIfAppropriate() {
		mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
		mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
		mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
		mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
		@@ -591,7 +596,13 @@ public class WifiConfigController implements TextWatcher,
		}
		if (mEapCaCertSpinner != null
		&& mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
		if (mEapDomainView != null
		String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
		if (caCertSelection.equals(mDoNotValidateEapServerString)) {
		// Display warning if user chooses not to validate the EAP server with a
		// user-supplied CA certificate in an EAP network configuration.
		mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
		} else if (!caCertSelection.equals(mUnspecifiedCertString)
		&& mEapDomainView != null
		&& mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
		&& TextUtils.isEmpty(mEapDomainView.getText().toString())) {
		// Display warning if user chooses to use a certificate without restricting the
		@@ -729,7 +740,8 @@ public class WifiConfigController implements TextWatcher,
		config.enterpriseConfig.setCaCertificateAliases(null);
		config.enterpriseConfig.setCaPath(null);
		config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
		if (caCert.equals(mUnspecifiedCertString)) {
		if (caCert.equals(mUnspecifiedCertString)
		\|\| caCert.equals(mDoNotValidateEapServerString)) {
		// ca_cert already set to null, so do nothing.
		} else if (caCert.equals(mUseSystemCertsString)) {
		config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
		@@ -763,7 +775,8 @@ public class WifiConfigController implements TextWatcher,
		}

		// Only set OCSP option if there is a valid CA certificate.
		if (caCert.equals(mUnspecifiedCertString)) {
		if (caCert.equals(mUnspecifiedCertString)
		\|\| caCert.equals(mDoNotValidateEapServerString)) {
		config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
		} else {
		config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
		@@ -1052,7 +1065,7 @@ public class WifiConfigController implements TextWatcher,
		loadCertificates(
		mEapCaCertSpinner,
		Credentials.CA_CERTIFICATE,
		null /* noCertificateString */,
		mDoNotValidateEapServerString /* noCertificateString */,
		false /* showMultipleCerts */,
		true /* showUsePreinstalledCertOption */);
		loadCertificates(
		@@ -1136,7 +1149,7 @@ public class WifiConfigController implements TextWatcher,
		} else {
		String[] caCerts = enterpriseConfig.getCaCertificateAliases();
		if (caCerts == null) {
		setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
		setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
		} else if (caCerts.length == 1) {
		setSelection(mEapCaCertSpinner, caCerts[0]);
		} else {
		@@ -1144,7 +1157,7 @@ public class WifiConfigController implements TextWatcher,
		loadCertificates(
		mEapCaCertSpinner,
		Credentials.CA_CERTIFICATE,
		null /* noCertificateString */,
		mDoNotValidateEapServerString /* noCertificateString */,
		true /* showMultipleCerts */,
		true /* showUsePreinstalledCertOption */);
		setSelection(mEapCaCertSpinner, mMultipleCertSetString);
		@@ -1277,7 +1290,8 @@ public class WifiConfigController implements TextWatcher,

		if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
		String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
		if (eapCertSelection.equals(mUnspecifiedCertString)) {
		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();
		@@ -1539,8 +1553,7 @@ public class WifiConfigController implements TextWatcher,
		}).collect(Collectors.toList()));
		}

		if (!TextUtils.isEmpty(noCertificateString)
		&& mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
		if (mAccessPointSecurity != AccessPoint.SECURITY_EAP_SUITE_B) {
		certs.add(noCertificateString);
		}

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

+23 −10

Original line number	Diff line number	Diff line
		@@ -160,6 +160,7 @@ public class WifiConfigController2 implements TextWatcher,
		private String mMultipleCertSetString;
		private String mUseSystemCertsString;
		private String mDoNotProvideEapUserCertString;
		private String mDoNotValidateEapServerString;

		private ScrollView mDialogContainer;
		private Spinner mSecuritySpinner;
		@@ -260,6 +261,8 @@ public class WifiConfigController2 implements TextWatcher,
		mUseSystemCertsString = mContext.getString(R.string.wifi_use_system_certs);
		mDoNotProvideEapUserCertString =
		mContext.getString(R.string.wifi_do_not_provide_eap_user_cert);
		mDoNotValidateEapServerString =
		mContext.getString(R.string.wifi_do_not_validate_eap_server);

		mSsidScanButton = (ImageButton) mView.findViewById(R.id.ssid_scanner_button);
		mDialogContainer = mView.findViewById(R.id.dialog_scrollview);
		@@ -538,7 +541,8 @@ public class WifiConfigController2 implements TextWatcher,
		// Disallow submit if the user has not selected a CA certificate for an EAP network
		// configuration.
		enabled = false;
		} else if (mEapDomainView != null
		} else if (!caCertSelection.equals(mDoNotValidateEapServerString)
		&& mEapDomainView != null
		&& mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
		&& TextUtils.isEmpty(mEapDomainView.getText().toString())) {
		// Disallow submit if the user chooses to use a certificate for EAP server
		@@ -559,6 +563,7 @@ public class WifiConfigController2 implements TextWatcher,
		}

		void showWarningMessagesIfAppropriate() {
		mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.GONE);
		mView.findViewById(R.id.no_user_cert_warning).setVisibility(View.GONE);
		mView.findViewById(R.id.no_domain_warning).setVisibility(View.GONE);
		mView.findViewById(R.id.ssid_too_long_warning).setVisibility(View.GONE);
		@@ -571,7 +576,13 @@ public class WifiConfigController2 implements TextWatcher,
		}
		if (mEapCaCertSpinner != null
		&& mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
		if (mEapDomainView != null
		String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
		if (caCertSelection.equals(mDoNotValidateEapServerString)) {
		// Display warning if user chooses not to validate the EAP server with a
		// user-supplied CA certificate in an EAP network configuration.
		mView.findViewById(R.id.no_ca_cert_warning).setVisibility(View.VISIBLE);
		} else if (!caCertSelection.equals(mUnspecifiedCertString)
		&& mEapDomainView != null
		&& mView.findViewById(R.id.l_domain).getVisibility() != View.GONE
		&& TextUtils.isEmpty(mEapDomainView.getText().toString())) {
		// Display warning if user chooses to use a certificate without restricting the
		@@ -718,7 +729,8 @@ public class WifiConfigController2 implements TextWatcher,
		config.enterpriseConfig.setCaCertificateAliases(null);
		config.enterpriseConfig.setCaPath(null);
		config.enterpriseConfig.setDomainSuffixMatch(mEapDomainView.getText().toString());
		if (caCert.equals(mUnspecifiedCertString)) {
		if (caCert.equals(mUnspecifiedCertString)
		\|\| caCert.equals(mDoNotValidateEapServerString)) {
		// ca_cert already set to null, so do nothing.
		} else if (caCert.equals(mUseSystemCertsString)) {
		config.enterpriseConfig.setCaPath(SYSTEM_CA_STORE_PATH);
		@@ -751,7 +763,8 @@ public class WifiConfigController2 implements TextWatcher,
		}

		// Only set OCSP option if there is a valid CA certificate.
		if (caCert.equals(mUnspecifiedCertString)) {
		if (caCert.equals(mUnspecifiedCertString)
		\|\| caCert.equals(mDoNotValidateEapServerString)) {
		config.enterpriseConfig.setOcsp(WifiEnterpriseConfig.OCSP_NONE);
		} else {
		config.enterpriseConfig.setOcsp(mEapOcspSpinner.getSelectedItemPosition());
		@@ -1035,7 +1048,7 @@ public class WifiConfigController2 implements TextWatcher,
		loadCertificates(
		mEapCaCertSpinner,
		Credentials.CA_CERTIFICATE,
		null /* noCertificateString */,
		mDoNotValidateEapServerString /* noCertificateString */,
		false /* showMultipleCerts */,
		true /* showUsePreinstalledCertOption */);
		loadCertificates(
		@@ -1120,7 +1133,7 @@ public class WifiConfigController2 implements TextWatcher,
		} else {
		String[] caCerts = enterpriseConfig.getCaCertificateAliases();
		if (caCerts == null) {
		setSelection(mEapCaCertSpinner, mUnspecifiedCertString);
		setSelection(mEapCaCertSpinner, mDoNotValidateEapServerString);
		} else if (caCerts.length == 1) {
		setSelection(mEapCaCertSpinner, caCerts[0]);
		} else {
		@@ -1128,7 +1141,7 @@ public class WifiConfigController2 implements TextWatcher,
		loadCertificates(
		mEapCaCertSpinner,
		Credentials.CA_CERTIFICATE,
		null /* noCertificateString */,
		mDoNotValidateEapServerString /* noCertificateString */,
		true /* showMultipleCerts */,
		true /* showUsePreinstalledCertOption */);
		setSelection(mEapCaCertSpinner, mMultipleCertSetString);
		@@ -1261,7 +1274,8 @@ public class WifiConfigController2 implements TextWatcher,

		if (mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
		String eapCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
		if (eapCertSelection.equals(mUnspecifiedCertString)) {
		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();
		@@ -1523,8 +1537,7 @@ public class WifiConfigController2 implements TextWatcher,
		}).collect(Collectors.toList()));
		}

		if (!TextUtils.isEmpty(noCertificateString)
		&& mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
		if (mWifiEntrySecurity != WifiEntry.SECURITY_EAP_SUITE_B) {
		certs.add(noCertificateString);
		}