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

Commit 9e0fdfec authored by Irfan Sheriff's avatar Irfan Sheriff Committed by Android (Google) Code Review
Browse files

Merge "Simplify proxy regex" into jb-mr1-dev

parents 50c1e5de e8d4f2f9

src/com/android/settings/ProxySelector.java

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class ProxySelector extends Fragment implements DialogCreatable { 
            "^$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";

    private static final Pattern HOSTNAME_PATTERN;

    private static final String EXCLUSION_REGEXP =

            "$|^(.?[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*)+$";

            "$|^[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*(\\.[a-zA-Z0-9]+(\\-[a-zA-Z0-9]+)*)*$";

    private static final Pattern EXCLUSION_PATTERN;

    static {

        HOSTNAME_PATTERN = Pattern.compile(HOSTNAME_REGEXP);