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

Commit a2f914c8 authored by Dominggoes Isakh's avatar Dominggoes Isakh Committed by Arne Coucheron
Browse files

Revert "Settings[Wifi]: fix the input invalid length for WEP encryption." 

This reverts commit 9663c317.

Change-Id: I3879ddb0ff53359c9d154045a6fcb067603e30f9
parent 79fbb048

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

+4 −16
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ public class WifiConfigController implements TextWatcher, 


        if (mPasswordView != null

                && ((mAccessPointSecurity == AccessPoint.SECURITY_WEP

                    && !isWepPskValid(mPasswordView.getText().toString(), mPasswordView.length()))

                        && mPasswordView.length() == 0)

                    || (mAccessPointSecurity == AccessPoint.SECURITY_PSK

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

            passwordInvalid = true;
@@ -497,8 +497,8 @@ public class WifiConfigController implements TextWatcher, 
                if (mPasswordView.length() != 0) {

                    int length = mPasswordView.length();

                    String password = mPasswordView.getText().toString();

                    // WEP-40, WEP-104, and WEP128

                    if ((length == 10 || length == 26 || length == 32)

                    // WEP-40, WEP-104, and 256-bit WEP (WEP-232?)

                    if ((length == 10 || length == 26 || length == 58)

                            && password.matches("[0-9A-Fa-f]*")) {

                        config.wepKeys[0] = password;

                    } else {
@@ -1329,16 +1329,4 @@ public class WifiConfigController implements TextWatcher, 
            mSimDisplayNames.add(displayname);

        }

    }



    private boolean isWepPskValid(String psk, int pskLength) {

        if (psk == null || pskLength <= 0) return false;



        // WEP40 or WEP104 or WEP128

        if (pskLength == 5 || pskLength == 13 || pskLength == 16

                ||((pskLength == 10 || pskLength == 26 || pskLength == 32)  // HEX format

                    && psk.matches("[0-9A-Fa-f]*"))) {

            return true;

        }

        return false;

    }

}