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

Commit 6e8c730b authored by Fred Quintana's avatar Fred Quintana Committed by Android (Google) Code Review
Browse files

Merge "allow + in usernames"

parents ddb19093 30d20305

common/java/com/android/common/Patterns.java

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class Patterns { 


    public static final Pattern EMAIL_ADDRESS

        = Pattern.compile(

            "[a-zA-Z0-9\\+\\.\\_\\%\\-]{1,256}" +

            "[a-zA-Z0-9\\+\\.\\_\\%\\-\\+]{1,256}" +

            "\\@" +

            "[a-zA-Z0-9][a-zA-Z0-9\\-]{0,64}" +

            "(" +

core/java/android/text/LoginFilter.java

+2 −2
Original line number Diff line number Diff line
@@ -158,11 +158,11 @@ public abstract class LoginFilter implements InputFilter { 


    /**

     * This filter rejects characters in the user name that are not compatible with Google login.

     * It is slightly less restrictive than the above filter in that it allows [a-zA-Z0-9._-]. 

     * It is slightly less restrictive than the above filter in that it allows [a-zA-Z0-9._-+]. 

     * 

     */

    public static class UsernameFilterGeneric extends LoginFilter {

        private static final String mAllowed = "@_-."; // Additional characters

        private static final String mAllowed = "@_-+."; // Additional characters

        

        public UsernameFilterGeneric() {

            super(false);