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

Commit 7f2601df authored by Matthew Brace's avatar Matthew Brace
Browse files

Updated regular expression to allow directory path in server field. Some... 

Updated regular expression to allow directory path in server field.  Some whitespace cleanup (tabs to spaces).
parent a5de5ceb

src/com/android/email/Utility.java

+14 −14
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ public class Utility { 
    public static boolean domainFieldValid(EditText view) {

        if (view.getText() != null) {

            String s = view.getText().toString();

			if (s.matches("^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}$")) {

            if (s.matches("^([a-zA-Z0-9]([a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])?\\.)+[a-zA-Z]{2,6}(\\/([a-zA-Z0-9\\-~])+)?$")) {

                return true;

            }

            if (s.matches("^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$")) {