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

Commit cbeaf2d0 authored by Shimeng (Simon) Wang's avatar Shimeng (Simon) Wang
Browse files

Revert "Updated URL pattern based on http://data.iana.org/TLD/tlds-alpha-by-domain.txt" 

This reverts commit 63b849ef8d6a47422b0f2779f1d9320f6a65d16b.
parent 32597815

core/java/android/util/Patterns.java

+6 −6
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import java.util.regex.Pattern; 
public class Patterns {

    /**

     *  Regular expression to match all IANA top-level domains.

     *  List accurate as of 2010/05/06.  List taken from:

     *  List accurate as of 2010/02/05.  List taken from:

     *  http://data.iana.org/TLD/tlds-alpha-by-domain.txt

     *  This pattern is auto-generated by frameworks/base/common/tools/make-iana-tld-pattern.py

     */
@@ -53,8 +53,8 @@ public class Patterns { 
        + "|u[agksyz]"

        + "|v[aceginu]"

        + "|w[fs]"

        + "|(xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-mgbaam7a8h|xn\\-\\-mgberp4a5d4ar|xn\\-\\-wgbh1c|xn\\-\\-zckzah)"

        + "|y[et]"

        + "|(xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-zckzah)"

        + "|y[etu]"

        + "|z[amw])";



    /**
@@ -65,7 +65,7 @@ public class Patterns { 


    /**

     *  Regular expression to match all IANA top-level domains for WEB_URL.

     *  List accurate as of 2010/05/06.  List taken from:

     *  List accurate as of 2010/02/05.  List taken from:

     *  http://data.iana.org/TLD/tlds-alpha-by-domain.txt

     *  This pattern is auto-generated by frameworks/base/common/tools/make-iana-tld-pattern.py

     */
@@ -94,8 +94,8 @@ public class Patterns { 
        + "|u[agksyz]"

        + "|v[aceginu]"

        + "|w[fs]"

        + "|(?:xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-mgbaam7a8h|xn\\-\\-mgberp4a5d4ar|xn\\-\\-wgbh1c|xn\\-\\-zckzah)"

        + "|y[et]"

        + "|(?:xn\\-\\-0zwm56d|xn\\-\\-11b5bs3a9aj6g|xn\\-\\-80akhbyknj4f|xn\\-\\-9t4b11yi5a|xn\\-\\-deba0ad|xn\\-\\-g6w251d|xn\\-\\-hgbk6aj7f53bba|xn\\-\\-hlcj6aya9esc7a|xn\\-\\-jxalpdlp|xn\\-\\-kgbechtv|xn\\-\\-zckzah)"

        + "|y[etu]"

        + "|z[amw]))";



    /**

core/tests/coretests/src/android/util/PatternsTest.java

+0 −15
Original line number Diff line number Diff line
@@ -68,13 +68,6 @@ public class PatternsTest extends TestCase { 
        t = Patterns.WEB_URL.matcher("xn--fsqu00a.xn--0zwm56d").matches();

        assertTrue("Valid URL", t);



        // Url for testing top level Arabic country code domain in Punycode:

        //   http://xn--4gbrim.xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c/ar/default.aspx

        t = Patterns.WEB_URL.matcher("http://xn--4gbrim.xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c/ar/default.aspx").matches();

        assertTrue("Valid URL", t);

        t = Patterns.WEB_URL.matcher("xn--4gbrim.xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c/ar/default.aspx").matches();

        assertTrue("Valid URL", t);



        // Internationalized URL.

        t = Patterns.WEB_URL.matcher("http://\uD604\uAE08\uC601\uC218\uC99D.kr").matches();

        assertTrue("Valid URL", t);
@@ -125,14 +118,6 @@ public class PatternsTest extends TestCase { 


        t = Patterns.DOMAIN_NAME.matcher("__+&42.xer").matches();

        assertFalse("Invalid domain", t);



        // Obsolete domain .yu

        t = Patterns.DOMAIN_NAME.matcher("test.yu").matches();

        assertFalse("Obsolete country code top level domain", t);



        // Testing top level Arabic country code domain in Punycode:

        t = Patterns.WEB_URL.matcher("xn--4gbrim.xn----rmckbbajlc6dj7bxne2c.xn--wgbh1c").matches();

        assertTrue("Valid domain", t);

    }



    @SmallTest