diff options
author | Sarah Chin <sarahchin@google.com> | 2019-08-22 13:48:35 -0700 |
---|---|---|
committer | Sarah Chin <sarahchin@google.com> | 2019-09-09 17:22:46 -0700 |
commit | 2ff4e466eb75222efec41cc1d7171dd0a020f127 (patch) | |
tree | 300864db73905ea93b831bcd245cf4efcf8d2220 | |
parent | 9b79974ba371bb7034c247ee08263b3cdca2f3f2 (diff) | |
parent | f626fde32cbe0092d9ad73d7ed797e097b01d9b2 (diff) | |
download | libphonenumber-2ff4e466eb75222efec41cc1d7171dd0a020f127.tar.gz |
Update libphonenumber to v8.10.18
Bug: 140599050
Test: cts and vogar
Change-Id: I54fe874f7ecb483154c860283ad3bc825563f9db
56 files changed, 61 insertions, 75 deletions
diff --git a/README.android b/README.android index fa49b5ec..fd90e5f0 100644 --- a/README.android +++ b/README.android @@ -1,5 +1,5 @@ URL: https://github.com/googlei18n/libphonenumber -Version: 8.10.15 +Version: 8.10.18 License: Apache 2 Description: Google Phone Number Library. diff --git a/README.version b/README.version index 43b7cc97..4b510904 100644 --- a/README.version +++ b/README.version @@ -1,3 +1,3 @@ URL: https://github.com/googlei18n/libphonenumber/ -Version: 8.10.15 +Version: 8.10.18 BugComponent: 24949 diff --git a/carrier/pom.xml b/carrier/pom.xml index 36b3dbb4..189a2b15 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.111</version> + <version>1.114</version> <packaging>jar</packaging> - <url>https://github.com/googlei18n/libphonenumber/</url> + <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </parent> <build> @@ -55,12 +55,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.121</version> + <version>2.124</version> </dependency> </dependencies> 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 51de6710..60133a94 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/227_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/227_en Binary files differindex 347d5e75..144626f3 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/374_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en Binary files differindex fdde42a5..5517be17 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru Binary files differindex c0f89056..102c5f6c 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/374_ru diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en Binary files differindex b60b4262..4b5a57ef 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/56_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 3430becd..4c17f45c 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/65_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en Binary files differindex 50df8c22..04d1c4ae 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/65_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en Binary files differindex 37b09c80..0e560065 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh Binary files differindex 6c83e92e..cbd3caec 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant Binary files differindex 6c54a1e2..e8104761 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/86_zh_Hant 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 1063e74e..971f6208 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/972_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/972_en Binary files differindex c4beaade..ac8fabae 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/992_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en Binary files differindex f470dea2..ab71520d 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/992_en diff --git a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en Binary files differindex 91019a7a..de487888 100644 --- a/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en +++ b/carrier/src/com/google/i18n/phonenumbers/carrier/data/996_en diff --git a/demo/pom.xml b/demo/pom.xml index ecf1a58e..f95d06fa 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -3,13 +3,13 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>demo</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> <packaging>jar</packaging> - <url>https://github.com/googlei18n/libphonenumber/</url> + <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </parent> <properties> @@ -89,17 +89,17 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>geocoder</artifactId> - <version>2.121</version> + <version>2.124</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>carrier</artifactId> - <version>1.111</version> + <version>1.114</version> </dependency> </dependencies> diff --git a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java index de4606a2..9dd9105b 100644 --- a/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java +++ b/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java @@ -402,7 +402,7 @@ public class PhoneNumberParserServlet extends HttpServlet { String newIssueLink = getNewIssueLink(phoneNumber, defaultCountry, geocodingLocale); String guidelinesLink = - "https://github.com/googlei18n/libphonenumber/blob/master/CONTRIBUTING.md"; + "https://github.com/google/libphonenumber/blob/master/CONTRIBUTING.md"; output.append("<b style=\"color:red\">File an issue</b>: by clicking on " + "<a target=\"_blank\" href=\"" + newIssueLink + "\">this link</a>, I confirm that I " + "have read the <a target=\"_blank\" href=\"" + guidelinesLink diff --git a/demo/war/phonenumberparser.jsp b/demo/war/phonenumberparser.jsp index 8c9cc201..4e7b7f2f 100644 --- a/demo/war/phonenumberparser.jsp +++ b/demo/war/phonenumberparser.jsp @@ -33,7 +33,7 @@ <input type="submit" value="Submit"> <input type="reset" value="Reset"> <p></p> - <a href="https://github.com/googlei18n/libphonenumber/">Back to libphonenumber</a> + <a href="https://github.com/google/libphonenumber/">Back to libphonenumber</a> </form> </body> </html> diff --git a/geocoder/pom.xml b/geocoder/pom.xml index c8e85fc0..10c1412e 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.121</version> + <version>2.124</version> <packaging>jar</packaging> - <url>https://github.com/googlei18n/libphonenumber/</url> + <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </parent> <build> @@ -63,12 +63,12 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </dependency> <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>prefixmapper</artifactId> - <version>2.121</version> + <version>2.124</version> </dependency> </dependencies> diff --git a/internal/prefixmapper/pom.xml b/internal/prefixmapper/pom.xml index a694dbd4..014131dd 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.121</version> + <version>2.124</version> <packaging>jar</packaging> - <url>https://github.com/googlei18n/libphonenumber/</url> + <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> <relativePath>../../pom.xml</relativePath> </parent> @@ -50,7 +50,7 @@ <dependency> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </dependency> </dependencies> diff --git a/libphonenumber/pom.xml b/libphonenumber/pom.xml index 32994eb8..0760f177 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>8.10.15</version> + <version>8.10.18</version> <packaging>jar</packaging> - <url>https://github.com/googlei18n/libphonenumber/</url> + <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> </parent> <build> diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java index fe86ca2e..a0d9957b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/AsYouTypeFormatter.java @@ -426,7 +426,19 @@ public class AsYouTypeFormatter { NATIONAL_PREFIX_SEPARATORS_PATTERN.matcher( numberFormat.getNationalPrefixFormattingRule()).find(); String formattedNumber = m.replaceAll(numberFormat.getFormat()); - return appendNationalNumber(formattedNumber); + // Check that we did not remove nor add any extra digits when we matched + // this formatting pattern. This usually happens after we entered the last + // digit during AYTF. Eg: In case of MX, we swallow mobile token (1) when + // formatted but AYTF should retain all the number entered and not change + // in order to match a format (of same leading digits and length) display + // in that way. + String fullOutput = appendNationalNumber(formattedNumber); + String formattedNumberDigitsOnly = PhoneNumberUtil.normalizeDiallableCharsOnly(fullOutput); + if (formattedNumberDigitsOnly.contentEquals(accruedInputWithoutFormatting)) { + // If it's the same (i.e entered number and format is same), then it's + // safe to return this in formatted number as nothing is lost / added. + return fullOutput; + } } } return ""; diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java index bbdc16ed..a725a033 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java +++ b/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java @@ -122,7 +122,6 @@ public class PhoneNumberUtil { static { HashMap<Integer, String> mobileTokenMap = new HashMap<Integer, String>(); - mobileTokenMap.put(52, "1"); mobileTokenMap.put(54, "9"); MOBILE_TOKEN_MAPPINGS = Collections.unmodifiableMap(mobileTokenMap); @@ -1426,14 +1425,6 @@ public class PhoneNumberUtil { // called within Brazil. Without that, most of the carriers won't connect the call. // Because of that, we return an empty string here. : ""; - } else if (isValidNumber && regionCode.equals("HU")) { - // The national format for HU numbers doesn't contain the national prefix, because that is - // how numbers are normally written down. However, the national prefix is obligatory when - // dialing from a mobile phone, except for short numbers. As a result, we add it back here - // if it is a valid regular length phone number. - formattedNumber = - getNddPrefixForRegion(regionCode, true /* strip non-digits */) + " " - + format(numberNoExt, PhoneNumberFormat.NATIONAL); } else if (countryCallingCode == NANPA_COUNTRY_CODE) { // For NANPA countries, we output international format for numbers that can be dialed // internationally, since that always works, except for numbers which might potentially be diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 Binary files differindex 252677fe..d03d525b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberAlternateFormatsProto_676 diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM Binary files differindex f42f1208..77742834 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_AM 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 a585d779..ddb45a48 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_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_BR Binary files differindex 3a8b77ce..871bc2a4 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_CC b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC Binary files differindex cdd8bc35..cf9ef100 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CC 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 7105e7d5..01977cc1 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_CX b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX Binary files differindex a6bcb15e..d43691d0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_CX diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB Binary files differindex 08f606f1..75ebe2ae 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_GB diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU Binary files differindex b84801f8..04504954 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_HU 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 55820412..c1dff8c5 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_KG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG Binary files differindex fecd01b5..56af97a8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR Binary files differindex 079e316f..bdcc2ce5 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_KR 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 585f4e7a..3c91c79f 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_MK b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK Binary files differindex 7652a23a..f24e3ce6 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MK 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 2933e11a..1c1e68ab 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_MV b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_MV Binary files differindex 1b12ff02..5daadbf8 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 af3949e6..3a4940d5 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_NE b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_NE Binary files differindex 525329b3..0e50b28a 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_SG b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG Binary files differindex fc9d8990..7f5ea24f 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_SG diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ Binary files differindex cfdd3930..0b3d2b57 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TJ 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 638f9039..545acd6c 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_TW b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW Binary files differindex 00852747..9ddaa6d0 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_TW diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI Binary files differindex 8176fadf..b0a9091b 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VI diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN Binary files differindex a4703dfe..37a25cdc 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/PhoneNumberMetadataProto_VN diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR Binary files differindex 49bdaec0..e8f5a9de 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_BR diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL Binary files differindex 25a869ad..2f4bd9d8 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_IL diff --git a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH Binary files differindex 92eb7caf..8e22d994 100644 --- a/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH +++ b/libphonenumber/src/com/google/i18n/phonenumbers/data/ShortNumberMetadataProto_TH diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java index 75977a0d..09a8a40b 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/AsYouTypeFormatterTest.java @@ -66,7 +66,7 @@ public class AsYouTypeFormatterTest extends TestMetadataTestCase { } public void testTooLongNumberMatchingMultipleLeadingDigits() { - // See https://github.com/googlei18n/libphonenumber/issues/36 + // See https://github.com/google/libphonenumber/issues/36 // The bug occurred last time for countries which have two formatting rules with exactly the // same leading digits pattern but differ in length. AsYouTypeFormatter formatter = phoneUtil.getAsYouTypeFormatter(RegionCode.ZZ); @@ -1164,7 +1164,7 @@ public class AsYouTypeFormatterTest extends TestMetadataTestCase { // when we try again to extract a country code we should ensure we use the last leading digit // pattern, rather than the first one such that it *thinks* it's found a valid formatting rule // again. - // https://github.com/googlei18n/libphonenumber/issues/437 + // https://github.com/google/libphonenumber/issues/437 assertEquals("+8698812", formatter.inputDigit('2')); assertEquals("+86988123", formatter.inputDigit('3')); assertEquals("+869881234", formatter.inputDigit('4')); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java b/libphonenumber/test/com/google/i18n/phonenumbers/CountryCodeToRegionCodeMapForTesting.java index 08851733..0c2188e8 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 38 as there are 29 different entries, + // The capacity is set to 37 as there are 28 different entries, // and this offers a load factor of roughly 0.75. Map<Integer, List<String>> countryCodeToRegionCodeMap = - new HashMap<Integer, List<String>>(38); + new HashMap<Integer, List<String>>(37); ArrayList<String> listWithRegionCode; @@ -54,10 +54,6 @@ public class CountryCodeToRegionCodeMapForTesting { countryCodeToRegionCodeMap.put(33, listWithRegionCode); listWithRegionCode = new ArrayList<String>(1); - listWithRegionCode.add("HU"); - countryCodeToRegionCodeMap.put(36, listWithRegionCode); - - listWithRegionCode = new ArrayList<String>(1); listWithRegionCode.add("IT"); countryCodeToRegionCodeMap.put(39, listWithRegionCode); diff --git a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java index bdce305c..1b26a10d 100644 --- a/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java +++ b/libphonenumber/test/com/google/i18n/phonenumbers/PhoneNumberUtilTest.java @@ -352,8 +352,8 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { } public void testGetCountryMobileToken() { - assertEquals("1", PhoneNumberUtil.getCountryMobileToken(phoneUtil.getCountryCodeForRegion( - RegionCode.MX))); + assertEquals("9", PhoneNumberUtil.getCountryMobileToken(phoneUtil.getCountryCodeForRegion( + RegionCode.AR))); // Country calling code for Sweden, which has no mobile token. assertEquals("", PhoneNumberUtil.getCountryMobileToken(phoneUtil.getCountryCodeForRegion( @@ -878,19 +878,6 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { false)); assertEquals("", phoneUtil.formatNumberForMobileDialing(deShortNumber, RegionCode.IT, false)); - // Test the special logic for Hungary, where the national prefix must be added before dialing - // from a mobile phone for regular length numbers, but not for short numbers. - PhoneNumber huRegularNumber = new PhoneNumber().setCountryCode(36) - .setNationalNumber(301234567L); - assertEquals("06301234567", phoneUtil.formatNumberForMobileDialing(huRegularNumber, - RegionCode.HU, false)); - assertEquals("+36301234567", phoneUtil.formatNumberForMobileDialing(huRegularNumber, - RegionCode.JP, false)); - PhoneNumber huShortNumber = new PhoneNumber().setCountryCode(36).setNationalNumber(104L); - assertEquals("104", phoneUtil.formatNumberForMobileDialing(huShortNumber, RegionCode.HU, - false)); - assertEquals("", phoneUtil.formatNumberForMobileDialing(huShortNumber, RegionCode.JP, false)); - // Test the special logic for NANPA countries, for which regular length phone numbers are always // output in international format, but short numbers are in national format. assertEquals("+16502530000", phoneUtil.formatNumberForMobileDialing(US_NUMBER, @@ -1804,26 +1791,26 @@ public class PhoneNumberUtilTest extends TestMetadataTestCase { public void testExtractPossibleNumber() { // Removes preceding funky punctuation and letters but leaves the rest untouched. - assertEquals("0800-345-600", PhoneNumberUtil.extractPossibleNumber("Tel:0800-345-600")); - assertEquals("0800 FOR PIZZA", PhoneNumberUtil.extractPossibleNumber("Tel:0800 FOR PIZZA")); + assertEquals("0800-345-600", PhoneNumberUtil.extractPossibleNumber("Tel:0800-345-600").toString()); + assertEquals("0800 FOR PIZZA", PhoneNumberUtil.extractPossibleNumber("Tel:0800 FOR PIZZA").toString()); // Should not remove plus sign - assertEquals("+800-345-600", PhoneNumberUtil.extractPossibleNumber("Tel:+800-345-600")); + assertEquals("+800-345-600", PhoneNumberUtil.extractPossibleNumber("Tel:+800-345-600").toString()); // Should recognise wide digits as possible start values. assertEquals("\uFF10\uFF12\uFF13", - PhoneNumberUtil.extractPossibleNumber("\uFF10\uFF12\uFF13")); + PhoneNumberUtil.extractPossibleNumber("\uFF10\uFF12\uFF13").toString()); // Dashes are not possible start values and should be removed. assertEquals("\uFF11\uFF12\uFF13", - PhoneNumberUtil.extractPossibleNumber("Num-\uFF11\uFF12\uFF13")); + PhoneNumberUtil.extractPossibleNumber("Num-\uFF11\uFF12\uFF13").toString()); // If not possible number present, return empty string. - assertEquals("", PhoneNumberUtil.extractPossibleNumber("Num-....")); + assertEquals("", PhoneNumberUtil.extractPossibleNumber("Num-....").toString()); // Leading brackets are stripped - these are not used when parsing. - assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000")); + assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000").toString()); // Trailing non-alpha-numeric characters should be removed. - assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000..- ..")); - assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000.")); + assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000..- ..").toString()); + assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000.").toString()); // This case has a trailing RTL char. - assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000\u200F")); + assertEquals("650) 253-0000", PhoneNumberUtil.extractPossibleNumber("(650) 253-0000\u200F").toString()); } public void testMaybeStripNationalPrefix() { @@ -3,9 +3,9 @@ <modelVersion>4.0.0</modelVersion> <groupId>com.googlecode.libphonenumber</groupId> <artifactId>libphonenumber-parent</artifactId> - <version>8.10.15</version> + <version>8.10.18</version> <packaging>pom</packaging> - <url>https://github.com/googlei18n/libphonenumber/</url> + <url>https://github.com/google/libphonenumber/</url> <parent> <groupId>org.sonatype.oss</groupId> @@ -31,10 +31,10 @@ </licenses> <scm> - <connection>scm:git:https://github.com/googlei18n/libphonenumber.git</connection> + <connection>scm:git:https://github.com/google/libphonenumber.git</connection> <developerConnection>scm:git:git@github.com:googlei18n/libphonenumber.git</developerConnection> - <url>https://github.com/googlei18n/libphonenumber/</url> - <tag>v8.10.15</tag> + <url>https://github.com/google/libphonenumber/</url> + <tag>v8.10.18</tag> </scm> <properties> |