diff options
| author | Neil Fuller <nfuller@google.com> | 2015-09-29 10:33:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-09-29 10:33:51 +0000 |
| commit | be1342be5a30ff6d1fd3fdf82ecac86d28328b08 (patch) | |
| tree | 73d33bafc96b6b005bb918d313eecf9b2583f83f | |
| parent | 0cf4daa9378769e13b7615f6f4f607b8a1a30fd1 (diff) | |
| parent | 279df210d5a4215ee2273bd23d29de5dc29e8370 (diff) | |
| download | libphonenumber-be1342be5a30ff6d1fd3fdf82ecac86d28328b08.tar.gz | |
Merge "Update libphonenumber to v7.0.11"
191 files changed, 431 insertions, 172 deletions
diff --git a/README.android b/README.android index 0e0faad8..e5925fae 100644 --- a/README.android +++ b/README.android @@ -1,4 +1,4 @@ URL: https://github.com/googlei18n/libphonenumber -Version: 7.0.2 (8109d4a) +Version: 7.0.11 License: Apache 2 Description: Google Phone Number Library. diff --git a/carrier/pom.xml b/carrier/pom.xml index 8d4f48c5..8081c90b 100644 --- a/carrier/pom.xml +++ b/carrier/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.10</version> + <version>1.17</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> </parent> <build> @@ -34,12 +34,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.20</version> + <version>2.27</version> </dependency> </dependencies> diff --git a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java index 201062d9..6b5b7532 100644 --- a/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java +++ b/carrier/src/com/google/i18n/phonenumbers/PhoneNumberToCarrierMapper.java @@ -100,7 +100,7 @@ public class PhoneNumberToCarrierMapper { * Gets the name of the carrier for the given phone number only when it is 'safe' to display to * users. A carrier name is considered safe if the number is valid and for a region that doesn't * support - * {@linkplain http://en.wikipedia.org/wiki/Mobile_number_portability mobile number portability}. + * <a href="http://en.wikipedia.org/wiki/Mobile_number_portability">mobile number portability</a>. * * @param number the phone number for which we want to get a carrier name * @param languageCode the language code in which the name should be written diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en Binary files differindex 76b63ab8..9d274719 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1246_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en Binary files differindex e9fc4842..d1e09ef5 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1684_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en Binary files differindex 11276170..53b180dc 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1868_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en Binary files differindex d846feb3..e4983246 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/1876_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en Binary files differindex fcf11785..04ebce54 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/212_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en Binary files differindex 3a61f8e0..64936f94 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/225_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en Binary files differindex eeb974c2..347d5e75 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en Binary files differindex 6557067f..e9a7595b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/230_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en Binary files differindex 04153037..754e4a57 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/231_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en Binary files differindex 5f54fae7..5f5f6441 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/232_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en Binary files differindex 5631cd0d..bb420ef8 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/235_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en Binary files differindex b4da8aae..6619b943 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/237_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/239_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/239_en Binary files differindex fbdf3144..9269d1c3 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/239_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/239_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en Binary files differindex 0b72209f..882427c0 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/242_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en Binary files differindex fc22e130..eb39a961 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/248_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/249_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/249_en Binary files differindex a2a1b50d..acd9edd1 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/249_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/249_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en Binary files differindex ae81c299..0965127f 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/252_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en Binary files differindex 96dae917..9a600ed5 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/254_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en Binary files differindex 4a39e537..ea1a183d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/255_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/263_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/263_en Binary files differindex ee7f65d8..210e0425 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/263_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/263_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en Binary files differindex 58756b9f..3e7a6f18 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/267_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en Binary files differindex 8e7de522..113260e3 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/32_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en Binary files differindex 99bd19c2..2228f23e 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/359_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en Binary files differindex 194c4f5b..ddbc09b2 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/373_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en Binary files differindex 4790933d..e879712e 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/380_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en Binary files differindex 33887cfb..9b7fa973 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/385_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en Binary files differindex 5d55c62d..2cf74e3b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/40_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en Binary files differindex 78ad721d..a2fb8eaa 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/41_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en Binary files differindex 3a0c3314..ef9a4c32 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/49_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en Binary files differnew file mode 100644 index 00000000..2bf9a5c2 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/509_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en Binary files differnew file mode 100644 index 00000000..eb754428 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/592_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en Binary files differindex 1f07d268..617424a8 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/60_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en Binary files differindex 1166795c..e3174c8b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/61_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en Binary files differindex 1705e80d..3b97e3e4 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/63_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/689_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/689_en Binary files differnew file mode 100644 index 00000000..b3d2a3e7 --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/689_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en Binary files differindex 1421b7b3..04096ffb 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/7_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en Binary files differindex 2cc4f2a0..9acebb84 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/855_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en Binary files differindex 588315b3..ad736ae3 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/91_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en Binary files differindex bfcef85f..da409f55 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/92_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_en Binary files differindex 6c40b774..3daede60 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/93_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en Binary files differindex 6c02e72a..b40e320c 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/94_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en Binary files differindex d5714db1..9134704d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/95_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en Binary files differindex 2d1b32e1..dccf09ef 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/960_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en Binary files differindex 63c9504e..b3160c2d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/961_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en Binary files differindex f7f622c2..6af4445f 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/962_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en Binary files differindex afc862ca..ba867b3b 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en Binary files differnew file mode 100644 index 00000000..a4838c7c --- /dev/null +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/976_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en Binary files differindex dd70905b..f4b6c7b4 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/977_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en Binary files differindex 0ea98361..86520d96 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/993_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config Binary files differindex bd013baa..1366ecb4 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/config +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/config diff --git a/demo/pom.xml b/demo/pom.xml index 7ec9fede..318cee45 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -4,11 +4,11 @@ <parent> <artifactId>libphonenumber-parent</artifactId> <groupId>com.googlecode.libphonenumber</groupId> - <version>7.0.4</version> + <version>7.0.11</version> </parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> <properties> <gae.version>1.5.4</gae.version> @@ -43,17 +43,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.20</version> + <version>2.27</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.10</version> + <version>1.17</version> </dependency> </dependencies> diff --git a/demo/war/WEB-INF/appengine-web.xml b/demo/war/WEB-INF/appengine-web.xml index 9a56cfad..5e9135be 100644 --- a/demo/war/WEB-INF/appengine-web.xml +++ b/demo/war/WEB-INF/appengine-web.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>libphonenumber</application> + <application>libphonenumber-hrd</application> <version>1</version> <threadsafe>true</threadsafe> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index a8805c13..65c8092d 100644 --- a/geocoder/pom.xml +++ b/geocoder/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.20</version> + <version>2.27</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> </parent> <build> @@ -42,12 +42,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.20</version> + <version>2.27</version> </dependency> </dependencies> diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en Binary files differnew file mode 100644 index 00000000..4440fe70 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/1854_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en Binary files differindex 0b5db051..329052f6 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/226_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en Binary files differindex 5df9b2fe..624068ff 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/263_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en Binary files differindex 6ea2c2b4..91675aa2 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/264_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en Binary files differindex b65865d7..6aea6389 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr Binary files differindex a9df7876..1f877a67 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/290_fr diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en Binary files differindex a4b84ac1..c8caa9e5 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi Binary files differindex 3824cfb6..0c64f988 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_fi diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se Binary files differindex b016fc3c..74fa2da8 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/358_se diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en Binary files differindex 074b9d7a..d3768297 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es Binary files differindex f55b59f5..e8267fcb 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/56_es diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/592_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/592_en Binary files differnew file mode 100644 index 00000000..d137ba57 --- /dev/null +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/592_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en Binary files differindex 557ddf77..e42eb908 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/62_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en Binary files differindex ebbda295..ec13539e 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_en diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh Binary files differindex db537eb9..6519ec58 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/86_zh diff --git a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config Binary files differindex 5d30fd41..1f85b55b 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config +++ b/geocoder/src/com/google/i18n/phonenumbers/geocoding/data/config diff --git a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data Binary files differindex 26c66a57..0c201a63 100644 --- a/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data +++ b/geocoder/src/com/google/i18n/phonenumbers/timezones/data/map_data diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml index 55e14f59..df16c660 100644 --- a/internal/prefixmapper/pom.xml +++ b/internal/prefixmapper/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.20</version> + <version>2.27</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -29,7 +29,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> </dependency> </dependencies> diff --git a/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java b/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java index ce0084e8..3f4f3d3a 100644 --- a/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java +++ b/internal/prefixmapper/src/com/google/i18n/phonenumbers/prefixmapper/PrefixTimeZonesMap.java @@ -37,7 +37,7 @@ public class PrefixTimeZonesMap implements Externalizable { private static final String RAW_STRING_TIMEZONES_SEPARATOR = "&"; /** - * Creates a {@link PrefixTimeZoneMap} initialized with {@code sortedPrefixTimeZoneMap}. Note + * Creates a {@link PrefixTimeZonesMap} initialized with {@code sortedPrefixTimeZoneMap}. Note * that the underlying implementation of this method is expensive thus should not be called by * time-critical applications. * diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index 21cd7355..e8f60f72 100644 --- a/libphonenumber/pom.xml +++ b/libphonenumber/pom.xml @@ -3,14 +3,14 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> <packaging>jar</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> </parent> <build> diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java b/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java index 5f3e269e..b8126dcd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMap.java @@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMap { // countries sharing a calling code, such as the NANPA countries, the one // indicated with "isMainCountryForCode" in the metadata should be first. static Map<Integer, List<String>> getCountryCodeToRegionCodeMap() { - // The capacity is set to 286 as there are 215 different entries, + // The capacity is set to 285 as there are 214 different entries, // and this offers a load factor of roughly 0.75. Map<Integer, List<String>> countryCodeToRegionCodeMap = - new HashMap<Integer, List<String>>(286); + new HashMap<Integer, List<String>>(285); ArrayList<String> listWithRegionCode; @@ -103,8 +103,9 @@ public class CountryCodeToRegionCodeMap { listWithRegionCode.add("HU"); countryCodeToRegionCodeMap.put(36, listWithRegionCode); - listWithRegionCode = new ArrayList<String>(1); + listWithRegionCode = new ArrayList<String>(2); listWithRegionCode.add("IT"); + listWithRegionCode.add("VA"); countryCodeToRegionCodeMap.put(39, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); @@ -570,10 +571,6 @@ public class CountryCodeToRegionCodeMap { countryCodeToRegionCodeMap.put(378, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); - listWithRegionCode.add("VA"); - countryCodeToRegionCodeMap.put(379, listWithRegionCode); - - listWithRegionCode = new ArrayList<String>(1); listWithRegionCode.add("UA"); countryCodeToRegionCodeMap.put(380, listWithRegionCode); diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java new file mode 100644 index 00000000..bedd570f --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MetadataSource.java @@ -0,0 +1,38 @@ +/* + * Copyright (C) 2015 The Libphonenumber Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.i18n.phonenumbers; + +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; + +/** + * A source for phone metadata from resources. + */ +interface MetadataSource { + /** + * Gets phone metadata for a region. + * @param regionCode the region code. + * @return the phone metadata for that region, or null if there is none. + */ + PhoneMetadata getMetadataForRegion(String regionCode); + + /** + * Gets phone metadata for a non-geographical region. + * @param countryCallingCode the country calling code. + * @return the phone metadata for that region, or null if there is none. + */ + PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode); +} diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java new file mode 100644 index 00000000..7c5bb8db --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java @@ -0,0 +1,155 @@ +/* + * Copyright (C) 2015 The Libphonenumber Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.i18n.phonenumbers; + +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; +import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; + +import java.io.IOException; +import java.io.InputStream; +import java.io.ObjectInputStream; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * Implementation of {@link MetadataSource} that reads from multiple resource files. + */ +final class MultiFileMetadataSourceImpl implements MetadataSource { + + private static final Logger logger = + Logger.getLogger(MultiFileMetadataSourceImpl.class.getName()); + + private static final String META_DATA_FILE_PREFIX = + "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto"; + + // A mapping from a region code to the PhoneMetadata for that region. + // Note: Synchronization, though only needed for the Android version of the library, is used in + // all versions for consistency. + private final Map<String, PhoneMetadata> regionToMetadataMap = + Collections.synchronizedMap(new HashMap<String, PhoneMetadata>()); + + // A mapping from a country calling code for a non-geographical entity to the PhoneMetadata for + // that country calling code. Examples of the country calling codes include 800 (International + // Toll Free Service) and 808 (International Shared Cost Service). + // Note: Synchronization, though only needed for the Android version of the library, is used in + // all versions for consistency. + private final Map<Integer, PhoneMetadata> countryCodeToNonGeographicalMetadataMap = + Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>()); + + // The prefix of the metadata files from which region data is loaded. + private final String currentFilePrefix; + + // The metadata loader used to inject alternative metadata sources. + private final MetadataLoader metadataLoader; + + // It is assumed that metadataLoader is not null. + public MultiFileMetadataSourceImpl(String currentFilePrefix, MetadataLoader metadataLoader) { + this.currentFilePrefix = currentFilePrefix; + this.metadataLoader = metadataLoader; + } + + // It is assumed that metadataLoader is not null. + public MultiFileMetadataSourceImpl(MetadataLoader metadataLoader) { + this(META_DATA_FILE_PREFIX, metadataLoader); + } + + @Override + public PhoneMetadata getMetadataForRegion(String regionCode) { + synchronized (regionToMetadataMap) { + if (!regionToMetadataMap.containsKey(regionCode)) { + // The regionCode here will be valid and won't be '001', so we don't need to worry about + // what to pass in for the country calling code. + loadMetadataFromFile(currentFilePrefix, regionCode, 0, metadataLoader); + } + } + return regionToMetadataMap.get(regionCode); + } + + @Override + public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) { + synchronized (countryCodeToNonGeographicalMetadataMap) { + if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) { + loadMetadataFromFile(currentFilePrefix, PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, + countryCallingCode, metadataLoader); + } + } + return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode); + } + + // @VisibleForTesting + void loadMetadataFromFile(String filePrefix, String regionCode, int countryCallingCode, + MetadataLoader metadataLoader) { + boolean isNonGeoRegion = PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); + String fileName = filePrefix + "_" + + (isNonGeoRegion ? String.valueOf(countryCallingCode) : regionCode); + InputStream source = metadataLoader.loadMetadata(fileName); + if (source == null) { + logger.log(Level.SEVERE, "missing metadata: " + fileName); + throw new IllegalStateException("missing metadata: " + fileName); + } + ObjectInputStream in = null; + try { + in = new ObjectInputStream(source); + PhoneMetadataCollection metadataCollection = loadMetadataAndCloseInput(in); + List<PhoneMetadata> metadataList = metadataCollection.getMetadataList(); + if (metadataList.isEmpty()) { + logger.log(Level.SEVERE, "empty metadata: " + fileName); + throw new IllegalStateException("empty metadata: " + fileName); + } + if (metadataList.size() > 1) { + logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); + } + PhoneMetadata metadata = metadataList.get(0); + if (isNonGeoRegion) { + countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); + } else { + regionToMetadataMap.put(regionCode, metadata); + } + } catch (IOException e) { + logger.log(Level.SEVERE, "cannot load/parse metadata: " + fileName, e); + throw new RuntimeException("cannot load/parse metadata: " + fileName, e); + } + } + + /** + * Loads the metadata protocol buffer from the given stream and closes the stream afterwards. Any + * exceptions that occur while reading the stream are propagated (though exceptions that occur + * when the stream is closed will be ignored). + * + * @param source the non-null stream from which metadata is to be read. + * @return the loaded metadata protocol buffer. + */ + private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) { + PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); + try { + metadataCollection.readExternal(source); + } catch (IOException e) { + logger.log(Level.WARNING, "error reading input (ignored)", e); + } finally { + try { + source.close(); + } catch (IOException e) { + logger.log(Level.WARNING, "error closing input stream (ignored)", e); + } + } + return metadataCollection; + } +} diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java index 4ce3cabd..a82210c7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberMatch.java @@ -33,7 +33,7 @@ import java.util.Arrays; * <pre> * CharSequence text = "Call me at +1 425 882-8080 for details."; - * RegionCode country = RegionCode.US; + * String country = "US"; * PhoneNumberUtil util = PhoneNumberUtil.getInstance(); * * // Find the first phone number match: diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index 173461c1..1882217e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -18,15 +18,11 @@ package com.google.i18n.phonenumbers; import com.google.i18n.phonenumbers.Phonemetadata.NumberFormat; import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadata; -import com.google.i18n.phonenumbers.Phonemetadata.PhoneMetadataCollection; import com.google.i18n.phonenumbers.Phonemetadata.PhoneNumberDesc; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber; import com.google.i18n.phonenumbers.Phonenumber.PhoneNumber.CountryCodeSource; -import java.io.IOException; import java.io.InputStream; -import java.io.ObjectInput; -import java.io.ObjectInputStream; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -78,9 +74,6 @@ public class PhoneNumberUtil { // input from overflowing the regular-expression engine. private static final int MAX_INPUT_STRING_LENGTH = 250; - private static final String META_DATA_FILE_PREFIX = - "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto"; - // Region-code for the unknown region. private static final String UNKNOWN_REGION = "ZZ"; @@ -535,6 +528,9 @@ public class PhoneNumberUtil { abstract boolean verify(PhoneNumber number, String candidate, PhoneNumberUtil util); } + // A source of metadata for different regions. + private final MetadataSource metadataSource; + // A mapping from a country calling code to the region codes which denote the region represented // by that country calling code. In the case of multiple regions sharing a calling code, such as // the NANPA regions, the one indicated with "isMainCountryForCode" in the metadata should be @@ -546,20 +542,6 @@ public class PhoneNumberUtil { // We set the initial capacity of the HashSet to 35 to offer a load factor of roughly 0.75. private final Set<String> nanpaRegions = new HashSet<String>(35); - // A mapping from a region code to the PhoneMetadata for that region. - // Note: Synchronization, though only needed for the Android version of the library, is used in - // all versions for consistency. - private final Map<String, PhoneMetadata> regionToMetadataMap = - Collections.synchronizedMap(new HashMap<String, PhoneMetadata>()); - - // A mapping from a country calling code for a non-geographical entity to the PhoneMetadata for - // that country calling code. Examples of the country calling codes include 800 (International - // Toll Free Service) and 808 (International Shared Cost Service). - // Note: Synchronization, though only needed for the Android version of the library, is used in - // all versions for consistency. - private final Map<Integer, PhoneMetadata> countryCodeToNonGeographicalMetadataMap = - Collections.synchronizedMap(new HashMap<Integer, PhoneMetadata>()); - // A cache for frequently used region-specific regular expressions. // The initial capacity is set to 100 as this seems to be an optimal value for Android, based on // performance measurements. @@ -574,19 +556,13 @@ public class PhoneNumberUtil { // currently contains < 12 elements so the default capacity of 16 (load factor=0.75) is fine. private final Set<Integer> countryCodesForNonGeographicalRegion = new HashSet<Integer>(); - // The prefix of the metadata files from which region data is loaded. - private final String currentFilePrefix; - // The metadata loader used to inject alternative metadata sources. - private final MetadataLoader metadataLoader; - /** * This class implements a singleton, the constructor is only visible to facilitate testing. */ // @VisibleForTesting - PhoneNumberUtil(String filePrefix, MetadataLoader metadataLoader, + PhoneNumberUtil(MetadataSource metadataSource, Map<Integer, List<String>> countryCallingCodeToRegionCodeMap) { - this.currentFilePrefix = filePrefix; - this.metadataLoader = metadataLoader; + this.metadataSource = metadataSource; this.countryCallingCodeToRegionCodeMap = countryCallingCodeToRegionCodeMap; for (Map.Entry<Integer, List<String>> entry : countryCallingCodeToRegionCodeMap.entrySet()) { List<String> regionCodes = entry.getValue(); @@ -610,66 +586,6 @@ public class PhoneNumberUtil { nanpaRegions.addAll(countryCallingCodeToRegionCodeMap.get(NANPA_COUNTRY_CODE)); } - // @VisibleForTesting - void loadMetadataFromFile(String filePrefix, String regionCode, int countryCallingCode, - MetadataLoader metadataLoader) { - boolean isNonGeoRegion = REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCode); - String fileName = filePrefix + "_" + - (isNonGeoRegion ? String.valueOf(countryCallingCode) : regionCode); - InputStream source = metadataLoader.loadMetadata(fileName); - if (source == null) { - logger.log(Level.SEVERE, "missing metadata: " + fileName); - throw new IllegalStateException("missing metadata: " + fileName); - } - ObjectInputStream in = null; - try { - in = new ObjectInputStream(source); - PhoneMetadataCollection metadataCollection = loadMetadataAndCloseInput(in); - List<PhoneMetadata> metadataList = metadataCollection.getMetadataList(); - if (metadataList.isEmpty()) { - logger.log(Level.SEVERE, "empty metadata: " + fileName); - throw new IllegalStateException("empty metadata: " + fileName); - } - if (metadataList.size() > 1) { - logger.log(Level.WARNING, "invalid metadata (too many entries): " + fileName); - } - PhoneMetadata metadata = metadataList.get(0); - if (isNonGeoRegion) { - countryCodeToNonGeographicalMetadataMap.put(countryCallingCode, metadata); - } else { - regionToMetadataMap.put(regionCode, metadata); - } - } catch (IOException e) { - logger.log(Level.SEVERE, "cannot load/parse metadata: " + fileName, e); - throw new RuntimeException("cannot load/parse metadata: " + fileName, e); - } - } - - /** - * Loads the metadata protocol buffer from the given stream and closes the stream afterwards. Any - * exceptions that occur while reading the stream are propagated (though exceptions that occur - * when the stream is closed will be ignored). - * - * @param source the non-null stream from which metadata is to be read. - * @return the loaded metadata protocol buffer. - */ - private static PhoneMetadataCollection loadMetadataAndCloseInput(ObjectInputStream source) { - PhoneMetadataCollection metadataCollection = new PhoneMetadataCollection(); - try { - metadataCollection.readExternal(source); - } catch (IOException e) { - logger.log(Level.WARNING, "error reading input (ignored)", e); - } finally { - try { - source.close(); - } catch (IOException e) { - logger.log(Level.WARNING, "error closing input stream (ignored)", e); - } finally { - return metadataCollection; - } - } - } - /** * Attempts to extract a possible number from the string passed in. This currently strips all * leading characters that cannot be used to start a phone number. Characters that can be used to @@ -812,7 +728,7 @@ public class PhoneNumberUtil { * works in such a way that the resultant subscriber number should be diallable, at least on some * devices. An example of how this could be used: * - * <pre> + * <pre>{@code * PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); * PhoneNumber number = phoneUtil.parse("16502530000", "US"); * String nationalSignificantNumber = phoneUtil.getNationalSignificantNumber(number); @@ -827,7 +743,7 @@ public class PhoneNumberUtil { * areaCode = ""; * subscriberNumber = nationalSignificantNumber; * } - * </pre> + * }</pre> * * N.B.: area code is a very ambiguous concept, so the I18N team generally recommends against * using it for most purposes, but recommends using the more general {@code national_number} @@ -872,7 +788,7 @@ public class PhoneNumberUtil { * number is formatted in the international format, if there is a subscriber number part that * follows. An example of how this could be used: * - * <pre> + * <pre>{@code * PhoneNumberUtil phoneUtil = PhoneNumberUtil.getInstance(); * PhoneNumber number = phoneUtil.parse("18002530000", "US"); * String nationalSignificantNumber = phoneUtil.getNationalSignificantNumber(number); @@ -888,7 +804,7 @@ public class PhoneNumberUtil { * nationalDestinationCode = ""; * subscriberNumber = nationalSignificantNumber; * } - * </pre> + * }</pre> * * Refer to the unittests to see the difference between this function and * {@link #getLengthOfGeographicalAreaCode}. @@ -1023,22 +939,40 @@ public class PhoneNumberUtil { /** * Create a new {@link PhoneNumberUtil} instance to carry out international phone number * formatting, parsing, or validation. The instance is loaded with all metadata by + * using the metadataSource specified. + * + * This method should only be used in the rare case in which you want to manage your own + * metadata loading. Calling this method multiple times is very expensive, as each time + * a new instance is created from scratch. When in doubt, use {@link #getInstance}. + * + * @param metadataSource Customized metadata source. This should not be null. + * @return a PhoneNumberUtil instance + */ + public static PhoneNumberUtil createInstance(MetadataSource metadataSource) { + if (metadataSource == null) { + throw new IllegalArgumentException("metadataSource could not be null."); + } + return new PhoneNumberUtil(metadataSource, + CountryCodeToRegionCodeMap.getCountryCodeToRegionCodeMap()); + } + + /** + * Create a new {@link PhoneNumberUtil} instance to carry out international phone number + * formatting, parsing, or validation. The instance is loaded with all metadata by * using the metadataLoader specified. * * This method should only be used in the rare case in which you want to manage your own * metadata loading. Calling this method multiple times is very expensive, as each time * a new instance is created from scratch. When in doubt, use {@link #getInstance}. * - * @param metadataLoader Customized metadata loader. If null, default metadata loader will - * be used. This should not be null. + * @param metadataLoader Customized metadata loader. This should not be null. * @return a PhoneNumberUtil instance */ public static PhoneNumberUtil createInstance(MetadataLoader metadataLoader) { if (metadataLoader == null) { throw new IllegalArgumentException("metadataLoader could not be null."); } - return new PhoneNumberUtil(META_DATA_FILE_PREFIX, metadataLoader, - CountryCodeToRegionCodeMap.getCountryCodeToRegionCodeMap()); + return createInstance(new MultiFileMetadataSourceImpl(metadataLoader)); } /** @@ -2039,27 +1973,14 @@ public class PhoneNumberUtil { if (!isValidRegionCode(regionCode)) { return null; } - synchronized (regionToMetadataMap) { - if (!regionToMetadataMap.containsKey(regionCode)) { - // The regionCode here will be valid and won't be '001', so we don't need to worry about - // what to pass in for the country calling code. - loadMetadataFromFile(currentFilePrefix, regionCode, 0, metadataLoader); - } - } - return regionToMetadataMap.get(regionCode); + return metadataSource.getMetadataForRegion(regionCode); } PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) { - synchronized (countryCodeToNonGeographicalMetadataMap) { - if (!countryCallingCodeToRegionCodeMap.containsKey(countryCallingCode)) { - return null; - } - if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) { - loadMetadataFromFile( - currentFilePrefix, REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode, metadataLoader); - } + if (!countryCallingCodeToRegionCodeMap.containsKey(countryCallingCode)) { + return null; } - return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode); + return metadataSource.getMetadataForNonGeographicalRegion(countryCallingCode); } boolean isNumberPossibleForDesc(String nationalNumber, PhoneNumberDesc numberDesc) { @@ -2132,7 +2053,7 @@ public class PhoneNumberUtil { List<String> regions = countryCallingCodeToRegionCodeMap.get(countryCode); if (regions == null) { String numberString = getNationalSignificantNumber(number); - logger.log(Level.WARNING, + logger.log(Level.INFO, "Missing/invalid country_code (" + countryCode + ") for number " + numberString); return null; } diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java index 401d260d..c0d01b4e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumberInfo.java @@ -101,6 +101,16 @@ public class ShortNumberInfo { } /** + * Helper method to check that the country calling code of the number matches the region it's + * being dialed from. + */ + private boolean regionDialingFromMatchesNumber(PhoneNumber number, + String regionDialingFrom) { + List<String> regionCodes = getRegionCodesForCountryCode(number.getCountryCode()); + return regionCodes.contains(regionDialingFrom); + } + + /** * Check whether a short number is a possible number when dialled from a region, given the number * in the form of a string, and the region where the number is dialed from. This provides a more * lenient check than {@link #isValidShortNumberForRegion}. @@ -133,6 +143,9 @@ public class ShortNumberInfo { * @return whether the number is a possible short number */ public boolean isPossibleShortNumberForRegion(PhoneNumber number, String regionDialingFrom) { + if (!regionDialingFromMatchesNumber(number, regionDialingFrom)) { + return false; + } PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionDialingFrom); if (phoneMetadata == null) { @@ -156,6 +169,9 @@ public class ShortNumberInfo { String shortNumber = getNationalSignificantNumber(number); for (String region : regionCodes) { PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(region); + if (phoneMetadata == null) { + continue; + } if (matcherApi.matchesPossibleNumber(shortNumber, phoneMetadata.getGeneralDesc())) { return true; } @@ -202,6 +218,9 @@ public class ShortNumberInfo { * @return whether the short number matches a valid pattern */ public boolean isValidShortNumberForRegion(PhoneNumber number, String regionDialingFrom) { + if (!regionDialingFromMatchesNumber(number, regionDialingFrom)) { + return false; + } PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion(regionDialingFrom); if (phoneMetadata == null) { @@ -314,6 +333,9 @@ public class ShortNumberInfo { * category. */ public ShortNumberCost getExpectedCostForRegion(PhoneNumber number, String regionDialingFrom) { + if (!regionDialingFromMatchesNumber(number, regionDialingFrom)) { + return ShortNumberCost.UNKNOWN_COST; + } // Note that regionDialingFrom may be null, in which case phoneMetadata will also be null. PhoneMetadata phoneMetadata = MetadataManager.getShortNumberMetadataForRegion( regionDialingFrom); diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java index 9f3a9273..70d4d427 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/ShortNumbersRegionCodeSet.java @@ -26,9 +26,9 @@ import java.util.Set; public class ShortNumbersRegionCodeSet { // A set of all region codes for which data is available. static Set<String> getRegionCodeSet() { - // The capacity is set to 309 as there are 232 different entries, + // The capacity is set to 317 as there are 238 different entries, // and this offers a load factor of roughly 0.75. - Set<String> regionCodeSet = new HashSet<String>(309); + Set<String> regionCodeSet = new HashSet<String>(317); regionCodeSet.add("AC"); regionCodeSet.add("AD"); @@ -69,6 +69,8 @@ public class ShortNumbersRegionCodeSet { regionCodeSet.add("CA"); regionCodeSet.add("CC"); regionCodeSet.add("CD"); + regionCodeSet.add("CF"); + regionCodeSet.add("CG"); regionCodeSet.add("CH"); regionCodeSet.add("CI"); regionCodeSet.add("CK"); @@ -93,6 +95,7 @@ public class ShortNumbersRegionCodeSet { regionCodeSet.add("EE"); regionCodeSet.add("EG"); regionCodeSet.add("EH"); + regionCodeSet.add("ER"); regionCodeSet.add("ES"); regionCodeSet.add("ET"); regionCodeSet.add("FI"); @@ -142,6 +145,7 @@ public class ShortNumbersRegionCodeSet { regionCodeSet.add("KI"); regionCodeSet.add("KM"); regionCodeSet.add("KN"); + regionCodeSet.add("KP"); regionCodeSet.add("KR"); regionCodeSet.add("KW"); regionCodeSet.add("KY"); @@ -182,6 +186,7 @@ public class ShortNumbersRegionCodeSet { regionCodeSet.add("MZ"); regionCodeSet.add("NA"); regionCodeSet.add("NC"); + regionCodeSet.add("NE"); regionCodeSet.add("NF"); regionCodeSet.add("NG"); regionCodeSet.add("NI"); @@ -223,6 +228,7 @@ public class ShortNumbersRegionCodeSet { regionCodeSet.add("SL"); regionCodeSet.add("SM"); regionCodeSet.add("SN"); + regionCodeSet.add("SO"); regionCodeSet.add("SR"); regionCodeSet.add("ST"); regionCodeSet.add("SV"); diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC Binary files differindex c1d98feb..8ad87f57 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF Binary files differindex d80c5968..01af0344 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR Binary files differindex dc775bb8..a683ee7e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS Binary files differindex f2a61e94..5289438a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU Binary files differindex 1212a887..5011c61a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB Binary files differindex 8c45b2b6..1cdd27ec 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD Binary files differindex a101edcf..06bbe413 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE Binary files differindex 8d2a5a27..d7ff507d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF Binary files differindex 2311f572..40c84bd2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG Binary files differindex 2d1787e0..6e9cfe3d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR Binary files differindex 6b971763..5b01fbb4 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS Binary files differindex f385d53a..b34a3656 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BS diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW Binary files differindex 777d118e..d0d2839d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY Binary files differindex bf010acb..03bd17fc 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA Binary files differindex 395baf20..fa4308c3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG Binary files differindex 52b7b7a8..b3c50cdd 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI Binary files differindex 880fb253..ecc5a52a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL Binary files differindex 14696510..8ef70535 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM Binary files differindex 7e8dff07..b4d0437b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR Binary files differindex 3857111b..141362d2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE Binary files differindex 2afa77e2..f7030e8c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ Binary files differindex 92b247fb..24d59b45 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_DZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH Binary files differindex 7221d941..47acce07 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_EH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES Binary files differindex b895148c..1e8c2384 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ES diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR Binary files differindex 80e45dde..3c17f9ae 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_FR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK Binary files differindex 7f3ff70a..a9d20fe7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN Binary files differindex a66ea52c..b1bc5d10 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR Binary files differindex 7c3657b7..10b08845 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT Binary files differindex 438952c4..db1595ab 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID Binary files differindex 90d5487e..b3dd4c31 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ID diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL Binary files differindex 156bed9a..9e24745e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN Binary files differindex e67ad27e..07108525 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT Binary files differindex 926ad1b5..09988e64 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_IT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM Binary files differindex 8a6be133..c95a0e2d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO Binary files differindex 85bd447f..24934243 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP Binary files differindex e3b61f1f..19f058b0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_JP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE Binary files differindex 6afb7b7d..9c28eb51 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH Binary files differindex 80a41a19..0fbc7d13 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW Binary files differindex 27ffde34..0ef6076f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY Binary files differindex 720d62c9..eb8f9594 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB Binary files differindex 39882264..17e48d67 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI Binary files differindex 25255311..2b67e52e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK Binary files differindex effd73cd..1d3d9d5e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR Binary files differindex 428ad11d..71fb1763 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU Binary files differindex c7bb66fe..77c48b99 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_LU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA Binary files differindex 73e4eab0..e8fd6b80 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD Binary files differindex a725e1f4..7115840d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM Binary files differindex c2cbbdf4..8c14bed6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN Binary files differindex 0a931c92..5be9de47 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR Binary files differindex a00424d8..89c57276 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU Binary files differindex 63676ca2..657c97a5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MU diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV Binary files differindex 5d3a10ab..1e578a8e 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX Binary files differindex 7dd414a5..7fbee872 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY Binary files differindex b1deefa8..80ffa2e5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA Binary files differindex f8d70495..8c6eb64d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE Binary files differindex 8d0e16c1..c693ec92 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP Binary files differindex 49a9ff4c..262fafda 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH Binary files differindex 6f565d6a..e27c62fe 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK Binary files differindex 729d06b7..d1d89044 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL Binary files differindex 491de26c..f05266ba 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT Binary files differindex 5c15da8f..1891fc52 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_PT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO Binary files differindex db604af0..903dec15 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_RO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB Binary files differindex d063ccf9..39d1ebc2 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC Binary files differindex 8762a536..63066982 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SC diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD Binary files differindex c56f4fbd..e85a1981 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE Binary files differindex c23cf2f9..626fb0ec 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH Binary files differindex 77d4a794..2c21c2ef 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SH diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL Binary files differindex 307391e5..4bf98c4a 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO Binary files differindex 96ea1998..84d0bd2c 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST Binary files differindex f364573a..d36d1553 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ST diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ Binary files differindex 3cd853b3..d26ba68d 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD Binary files differindex b5401425..c87d8b57 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM Binary files differindex 9013b60d..065034d3 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TM diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT Binary files differindex 5afe1cc1..5347e820 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ Binary files differindex 2e95acf2..2f4527a8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TZ diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA Binary files differindex f700468f..1995a300 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_UA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US Binary files differindex cee870e8..04521e58 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_US diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA Binary files differindex 72c260fa..fa28bc47 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VA diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT Binary files differindex 2f6153d9..f09bf95b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_YT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW Binary files differindex f295d2c1..07816329 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_ZW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE Binary files differindex 1352acfc..39091613 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD Binary files differindex dfa9f7a1..60aacaf8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CD diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF Binary files differnew file mode 100644 index 00000000..a2c4c037 --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CF diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG Binary files differnew file mode 100644 index 00000000..91065b5c --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_CG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER Binary files differnew file mode 100644 index 00000000..439d2304 --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ER diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY Binary files differindex b5977d98..0a64e1c7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_GY diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK Binary files differindex db5f3f8d..6d67cb65 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR Binary files differindex df743037..08316ca7 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_HR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP Binary files differnew file mode 100644 index 00000000..25823d11 --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KP diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR Binary files differindex 6e009678..2beffe37 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_KR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI Binary files differindex 4c5f9bf2..6817a85b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK Binary files differindex adb6cfc9..4c5e7124 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_LK diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX Binary files differindex 7e666437..c5fa87e8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_MX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE Binary files differnew file mode 100644 index 00000000..04d35ff8 --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NE diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO Binary files differindex f3f8843a..d1659275 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_NO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT Binary files differindex 15fb4780..ea10c6ac 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_PT diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB Binary files differindex 53f59a03..4035fa33 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO Binary files differnew file mode 100644 index 00000000..08103b28 --- /dev/null +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_SO diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US Binary files differindex 7c0cfb76..9b23ccdb 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_US diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW Binary files differindex 1a97eb42..ab6a58ea 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_ZW diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java index 67612983..f6a4226a 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java @@ -31,10 +31,10 @@ public class CountryCodeToRegionCodeMapForTesting { // countries sharing a calling code, such as the NANPA countries, the one // indicated with "isMainCountryForCode" in the metadata should be first. static Map<Integer, List<String>> getCountryCodeToRegionCodeMap() { - // The capacity is set to 30 as there are 23 different entries, + // The capacity is set to 32 as there are 24 different entries, // and this offers a load factor of roughly 0.75. Map<Integer, List<String>> countryCodeToRegionCodeMap = - new HashMap<Integer, List<String>>(30); + new HashMap<Integer, List<String>>(32); ArrayList<String> listWithRegionCode; @@ -63,6 +63,10 @@ public class CountryCodeToRegionCodeMapForTesting { countryCodeToRegionCodeMap.put(44, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); + listWithRegionCode.add("SE"); + countryCodeToRegionCodeMap.put(46, listWithRegionCode); + + listWithRegionCode = new ArrayList<String>(1); listWithRegionCode.add("PL"); countryCodeToRegionCodeMap.put(48, listWithRegionCode); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java new file mode 100644 index 00000000..a1d30c57 --- /dev/null +++ b/libphonenumber/test/com/google/i18n/phonenumbers/MultiFileMetadataSourceImplTest.java @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2015 The Libphonenumber Authors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.google.i18n.phonenumbers; + +/** + * Unit tests for MultiFileMetadataSourceImpl.java. + */ +public class MultiFileMetadataSourceImplTest extends TestMetadataTestCase { + + private final MultiFileMetadataSourceImpl multiFileMetadataSource; + + public MultiFileMetadataSourceImplTest() { + multiFileMetadataSource = new MultiFileMetadataSourceImpl(TEST_META_DATA_FILE_PREFIX, + PhoneNumberUtil.DEFAULT_METADATA_LOADER); + } + + public void testMissingMetadataFileThrowsRuntimeException() { + // In normal usage we should never get a state where we are asking to load metadata that doesn't + // exist. However if the library is packaged incorrectly in the jar, this could happen and the + // best we can do is make sure the exception has the file name in it. + try { + multiFileMetadataSource.loadMetadataFromFile( + "no/such/file", "XX", -1, PhoneNumberUtil.DEFAULT_METADATA_LOADER); + fail("expected exception"); + } catch (RuntimeException e) { + assertTrue("Unexpected error: " + e, e.toString().contains("no/such/file_XX")); + } + try { + multiFileMetadataSource.loadMetadataFromFile("no/such/file", + PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, 123, + PhoneNumberUtil.DEFAULT_METADATA_LOADER); + fail("expected exception"); + } catch (RuntimeException e) { + assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_123")); + } + } +} diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index 1f98c036..725a5904 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -132,26 +132,6 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { assertNull(phoneUtil.getMetadataForNonGeographicalRegion(-1)); } - public void testMissingMetadataFileThrowsRuntimeException() { - // In normal usage we should never get a state where we are asking to load metadata that doesn't - // exist. However if the library is packaged incorrectly in the jar, this could happen and the - // best we can do is make sure the exception has the file name in it. - try { - phoneUtil.loadMetadataFromFile( - "no/such/file", "XX", -1, PhoneNumberUtil.DEFAULT_METADATA_LOADER); - fail("expected exception"); - } catch (RuntimeException e) { - assertTrue("Unexpected error: " + e, e.toString().contains("no/such/file_XX")); - } - try { - phoneUtil.loadMetadataFromFile("no/such/file", PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, - 123, PhoneNumberUtil.DEFAULT_METADATA_LOADER); - fail("expected exception"); - } catch (RuntimeException e) { - assertTrue("Unexpected error: " + e, e.getMessage().contains("no/such/file_123")); - } - } - public void testGetInstanceLoadUSMetadata() { PhoneMetadata metadata = phoneUtil.getMetadataForRegion(RegionCode.US); assertEquals("US", metadata.getId()); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java index 63661a90..edcb004c 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/ShortNumberInfoTest.java @@ -333,6 +333,17 @@ public class ShortNumberInfoTest extends TestMetadataTestCase { shortInfo.getExpectedCostForRegion(parse("211", RegionCode.CA), RegionCode.CA)); } + public void testCountryCallingCodeIsNotIgnored() { + // +46 is the country calling code for Sweden (SE), and 40404 is a valid short number in the US. + assertFalse(shortInfo.isPossibleShortNumberForRegion( + parse("+4640404", RegionCode.SE), RegionCode.US)); + assertFalse(shortInfo.isValidShortNumberForRegion( + parse("+4640404", RegionCode.SE), RegionCode.US)); + assertEquals(ShortNumberInfo.ShortNumberCost.UNKNOWN_COST, + shortInfo.getExpectedCostForRegion( + parse("+4640404", RegionCode.SE), RegionCode.US)); + } + private PhoneNumber parse(String number, String regionCode) { try { return phoneUtil.parse(number, regionCode); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java index 8845eb0c..99def5ae 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/TestMetadataTestCase.java @@ -27,7 +27,7 @@ import junit.framework.TestCase; * @author Shaopeng Jia */ public class TestMetadataTestCase extends TestCase { - private static final String TEST_META_DATA_FILE_PREFIX = + protected static final String TEST_META_DATA_FILE_PREFIX = "/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting"; protected final PhoneNumberUtil phoneUtil; @@ -38,7 +38,8 @@ public class TestMetadataTestCase extends TestCase { static PhoneNumberUtil initializePhoneUtilForTesting() { PhoneNumberUtil phoneUtil = new PhoneNumberUtil( - TEST_META_DATA_FILE_PREFIX, PhoneNumberUtil.DEFAULT_METADATA_LOADER, + new MultiFileMetadataSourceImpl(TEST_META_DATA_FILE_PREFIX, + PhoneNumberUtil.DEFAULT_METADATA_LOADER), CountryCodeToRegionCodeMapForTesting.getCountryCodeToRegionCodeMap()); PhoneNumberUtil.setInstance(phoneUtil); return phoneUtil; diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE Binary files differnew file mode 100644 index 00000000..c9643cdc --- /dev/null +++ b/libphonenumber/test/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProtoForTesting_SE @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>7.0.4</version> + <version>7.0.11</version> <packaging>pom</packaging> <url>https://github.com/googlei18n/libphonenumber/</url> diff --git a/release_notes.txt b/release_notes.txt index 2d4aead5..66b5a87a 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,76 @@ +Sep 16, 2015: libphonenumber-7.0.11 +Metadata changes: + - Updated phone metadata for region code(s): + IN, KE, LR, MM, MR, NA, NE, PT, RO, SO, TZ, US + - New short number metadata for region code(s): CF, CG, ER, KP, NE, SO + - Updated short number metadata for region code(s): CD, NO, PT + - New geocoding data for country calling code(s): 1854 (en) + - Updated geocoding data for country calling code(s): 264 (en) + - Updated carrier data for country calling code(s): + 40 (en), 91 (en), 95 (en), 227 (en), 231 (en), 252 (en), 254 (en), 255 (en), + 509 (en) + +Aug 31, 2015: libphonenumber-7.0.10 +Metadata changes: + - Updated phone metadata for region code(s): + AU, BY, CR, DZ, EH, ES, HK, HT, IN, JO, MN, MU, ST, TD, TT, ZW + - Updated short number metadata for region code(s): HK, KR + - Updated geocoding data for country calling code(s): 263 (en) + - New carrier data for country calling code(s): 509 (en), 976 (en) + - Updated carrier data for country calling code(s): + 41 (en), 61 (en), 91 (en), 230 (en), 235 (en), 239 (en) + +Aug 03, 2015: libphonenumber-7.0.9 +Metadata changes: + - Updated phone metadata for region code(s): AR, IN, MX, PL, SZ, YT, ZW + - Updated short number metadata for region code(s): MX, ZW + - Updated carrier data for country calling code(s): 91 (en), 263 (en) + +Jul 14, 2015: libphonenumber-7.0.8 +Metadata changes: + - Updated phone metadata for region code(s): + AC, BS, BW, CL, DE, DZ, HN, HR, IL, IN, IT, JO, KY, MA, NP, PL, SH, SL, TM, + UA, VA + - Updated short number metadata for region code(s): HR + - Updated geocoding data for country calling code(s): 56 (en, es) + - Updated carrier data for country calling code(s): + 49 (en), 212 (en), 232 (en), 267 (en), 380 (en), 385 (en), 962 (en), + 972 (en), 977 (en), 993 (en) +- Updated / refreshed time zone meta data. + +Jun 24, 2015: libphonenumber-7.0.7 +Metadata changes: + - Updated phone metadata for region code(s): + AC, BF, BG, CG, CM, FR, IL, IN, JP, KW, LB, LI, SB, SD, SH, TT + - Updated short number metadata for region code(s): GY, SB + - New geocoding data for country calling code(s): 592 (en) + - Updated geocoding data for country calling code(s): + 86 (en, zh), 226 (en), 290 (en, fr) + - New carrier data for country calling code(s): 592 (en), 689 (en) + - Updated carrier data for country calling code(s): + 7 (en), 60 (en), 91 (en), 237 (en), 242 (en), 249 (en), 359 (en), 961 (en), + 1868 (en) +- Updated / refreshed time zone meta data. + +May 29, 2015: libphonenumber-7.0.6 +Metadata changes: + - Updated phone metadata for region code(s): + BB, BR, CR, ID, IL, JO, KW, LK, LU, MD, MM, MV, MY, PH, PK, SC, SE + - Updated short number metadata for region code(s): BE, LK, US + - Updated carrier data for country calling code(s): + 60 (en), 63 (en), 92 (en), 94 (en), 95 (en), 248 (en), 373 (en), 960 (en), + 972 (en), 1246 (en) + +Apr 24, 2015: libphonenumber-7.0.5 +* Metadata changes: + - Updated phone metadata for region code(s): + AF, AS, BD, BE, CA, CI, ID, IN, JM, KH, LI, LU, MU, NE, PL + - Updated short number metadata for region code(s): BE, LI + - Updated geocoding data for country calling code(s): + 62 (en), 86 (en, zh), 358 (en, fi, se) + - Updated carrier data for country calling code(s): + 32 (en), 93 (en), 225 (en), 227 (en), 855 (en), 1684 (en), 1876 (en) + Mar 25, 2015: libphonenumber-7.0.4 * Metadata changes: - Updated phone metadata for region code(s): CA, HU, IL, JO, LU, SG, SL, US |