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

Commit 35cc22fc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Disable submit button when PSK pass is invalid" into oc-dev

parents 64857437 92119d7f

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

+4 −3
Original line number Diff line number Diff line
@@ -403,12 +403,13 @@ public class WifiConfigController implements TextWatcher, 
                && ((mAccessPointSecurity == AccessPoint.SECURITY_WEP

                        && mPasswordView.length() == 0)

                    || (mAccessPointSecurity == AccessPoint.SECURITY_PSK

                           && mPasswordView.length() < 8))) {

                           && (mPasswordView.length() < 8 || mPasswordView.length() > 63)))) {

            passwordInvalid = true;

        }



        if ((mSsidView != null && mSsidView.length() == 0)

                || ((mAccessPoint == null || !mAccessPoint.isSaved()) && passwordInvalid)) {

                || ((mAccessPoint == null || !mAccessPoint.isSaved()) && passwordInvalid

                // If AccessPoint is saved (we're modifying it), allow zero length (unchanged) pw

                || mAccessPoint.isSaved() && passwordInvalid && mPasswordView.length() > 0)) {

            enabled = false;

        } else {

            enabled = ipAndProxyFieldsAreValid();