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

Fix submit button display for WPS

Browse Source 
Change Icd3fde90 exposed an existing issue where password validity was
being checked for WPS as well. Fix it.

Bug: 4391449
Change-Id: I60ca8869eee680f5ec71284a1ac6ba956a992312
This commit is contained in:
Irfan Sheriff
2011-05-20 16:10:59 -07:00
parent d36628a74e
commit 21e644a9a8
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -265,10 +265,18 @@ public class WifiConfigController implements TextWatcher,
if (submit == null) return; if (submit == null) return;
boolean enabled = false; boolean enabled = false;
boolean passwordInvalid = false;
/* Check password invalidity for manual network set up alone */
if (chosenNetworkSetupMethod() == MANUAL &&
((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) ||
(mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8))) {
passwordInvalid = true;
}
if ((mSsidView != null && mSsidView.length() == 0) || if ((mSsidView != null && mSsidView.length() == 0) ||
((mAccessPoint == null || mAccessPoint.networkId == INVALID_NETWORK_ID) && ((mAccessPoint == null || mAccessPoint.networkId == INVALID_NETWORK_ID) &&
((mAccessPointSecurity == AccessPoint.SECURITY_WEP && mPasswordView.length() == 0) || passwordInvalid)) {
(mAccessPointSecurity == AccessPoint.SECURITY_PSK && mPasswordView.length() < 8)))) {
enabled = false; enabled = false;
} else { } else {
if (ipAndProxyFieldsAreValid()) { if (ipAndProxyFieldsAreValid()) {
@@ -729,16 +737,14 @@ public class WifiConfigController implements TextWatcher,
if (parent == mSecuritySpinner) { if (parent == mSecuritySpinner) {
mAccessPointSecurity = position; mAccessPointSecurity = position;
showSecurityFields(); showSecurityFields();
enableSubmitIfAppropriate();
} else if (parent == mNetworkSetupSpinner) { } else if (parent == mNetworkSetupSpinner) {
showNetworkSetupFields(); showNetworkSetupFields();
} else if (parent == mProxySettingsSpinner) { } else if (parent == mProxySettingsSpinner) {
showProxyFields(); showProxyFields();
enableSubmitIfAppropriate();
} else { } else {
showIpConfigFields(); showIpConfigFields();
enableSubmitIfAppropriate();
} }
enableSubmitIfAppropriate();
} }
@Override @Override