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

Merge "Fix bug in Add network fragment"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-15 00:45:17 +00:00
committed by Android (Google) Code Review
parent 2508560eeb 0c6f8065c2
commit 6ca83b53a9
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -465,8 +465,7 @@ public class WifiConfigController implements TextWatcher,
} else { } else {
enabled = ipAndProxyFieldsAreValid(); enabled = ipAndProxyFieldsAreValid();
} }
if (mEapCaCertSpinner != null if (mAccessPointSecurity == AccessPoint.SECURITY_EAP) {
&& mView.findViewById(R.id.l_ca_cert).getVisibility() != View.GONE) {
String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem(); String caCertSelection = (String) mEapCaCertSpinner.getSelectedItem();
if (caCertSelection.equals(mUnspecifiedCertString)) { if (caCertSelection.equals(mUnspecifiedCertString)) {
// Disallow submit if the user has not selected a CA certificate for an EAP network // Disallow submit if the user has not selected a CA certificate for an EAP network
@@ -482,10 +481,8 @@ public class WifiConfigController implements TextWatcher,
enabled = false; enabled = false;
} }
} }
if (mEapUserCertSpinner != null if (mAccessPointSecurity == AccessPoint.SECURITY_EAP
&& mView.findViewById(R.id.l_user_cert).getVisibility() != View.GONE && mEapUserCertSpinner.getSelectedItem().equals(mUnspecifiedCertString)) {
&& ((String) mEapUserCertSpinner.getSelectedItem())
.equals(mUnspecifiedCertString)) {
// Disallow submit if the user has not selected a user certificate for an EAP network // Disallow submit if the user has not selected a user certificate for an EAP network
// configuration. // configuration.
enabled = false; enabled = false;

16
tests/robotests/src/com/android/settings/wifi/WifiConfigControllerTest.java
View File

@@ -183,6 +183,22 @@ public class WifiConfigControllerTest {
mController.isSubmittable(); mController.isSubmittable();
} }
@Test
public void isSubmittable_EapToPskWithValidPassword_shouldReturnTrue() {
final TextView password = mView.findViewById(R.id.password);
final Spinner securitySpinner = mView.findViewById(R.id.security);
assertThat(password).isNotNull();
assertThat(securitySpinner).isNotNull();
when(mAccessPoint.isSaved()).thenReturn(true);
// Change it from EAP to PSK
mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_EAP, 0);
mController.onItemSelected(securitySpinner, null, AccessPoint.SECURITY_PSK, 0);
password.setText(GOOD_PSK);
assertThat(mController.isSubmittable()).isTrue();
}
@Test @Test
public void getSignalString_notReachable_shouldHaveNoSignalString() { public void getSignalString_notReachable_shouldHaveNoSignalString() {
when(mAccessPoint.isReachable()).thenReturn(false); when(mAccessPoint.isReachable()).thenReturn(false);