phonelib 0.5.5 → 0.5.6

data/data/libphonenumber/debian/control

@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
 Uploaders: Daniel Pocock <daniel@pocock.pro>, Fredrik Roubert <roubert@google.com>
 Build-Depends: cdbs,
-               cmake,
+               cmake (>= 3.1),
                debhelper (>= 9),
                default-jdk | java-sdk,
                libboost-dev (>= 1.40),

data/data/libphonenumber/java/carrier/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>carrier</artifactId>
-  <version>1.24-SNAPSHOT</version>
+  <version>1.27-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.4-SNAPSHOT</version>
+    <version>7.2.7-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -34,12 +34,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.4-SNAPSHOT</version>
+      <version>7.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.34-SNAPSHOT</version>
+      <version>2.37-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/demo/pom.xml

@@ -4,14 +4,14 @@
   <parent>
     <artifactId>libphonenumber-parent</artifactId>
     <groupId>com.googlecode.libphonenumber</groupId>
-    <version>7.2.4-SNAPSHOT</version>
+    <version>7.2.7-SNAPSHOT</version>
   </parent>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>demo</artifactId>
-  <version>7.2.4-SNAPSHOT</version>
+  <version>7.2.7-SNAPSHOT</version>
 
   <properties>
-    <gae.version>1.5.4</gae.version>
+    <gae.version>1.9.32</gae.version>
   </properties>
 
   <repositories>
@@ -48,17 +48,17 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.4-SNAPSHOT</version>
+      <version>7.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>geocoder</artifactId>
-      <version>2.34-SNAPSHOT</version>
+      <version>2.37-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>carrier</artifactId>
-      <version>1.24-SNAPSHOT</version>
+      <version>1.27-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/demo/src/com/google/phonenumbers/PhoneNumberParserServlet.java

@@ -103,7 +103,7 @@ public class PhoneNumberParserServlet extends HttpServlet {
     StringBuilder output;
     resp.setContentType("text/html");
     resp.setCharacterEncoding(UTF_8.name());
-    if (fileContents.length() == 0) {
+    if (fileContents == null || fileContents.length() == 0) {
       // Redirect to a URL with the given input encoded in the query parameters.
       Locale geocodingLocale = new Locale(languageCode, regionCode);
       resp.sendRedirect(getPermaLinkURL(phoneNumber, defaultCountry, geocodingLocale,
@@ -195,8 +195,9 @@ public class PhoneNumberParserServlet extends HttpServlet {
     StringBuilder permaLink = new StringBuilder(
         absoluteURL ? "http://libphonenumber.appspot.com/phonenumberparser" : "/phonenumberparser");
     try {
-      permaLink.append("?number=" + URLEncoder.encode(phoneNumber, UTF_8.name()));
-      if (!defaultCountry.isEmpty()) {
+      permaLink.append(
+          "?number=" + URLEncoder.encode(phoneNumber != null ? phoneNumber : "", UTF_8.name()));
+      if (defaultCountry != null && !defaultCountry.isEmpty()) {
         permaLink.append("&country=" + URLEncoder.encode(defaultCountry, UTF_8.name()));
       }
       if (!geocodingLocale.getLanguage().equals(ENGLISH.getLanguage()) ||

data/data/libphonenumber/java/geocoder/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>geocoder</artifactId>
-  <version>2.34-SNAPSHOT</version>
+  <version>2.37-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.4-SNAPSHOT</version>
+    <version>7.2.7-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -42,12 +42,12 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.4-SNAPSHOT</version>
+      <version>7.2.7-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>prefixmapper</artifactId>
-      <version>2.34-SNAPSHOT</version>
+      <version>2.37-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/internal/prefixmapper/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>prefixmapper</artifactId>
-  <version>2.34-SNAPSHOT</version>
+  <version>2.37-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.4-SNAPSHOT</version>
+    <version>7.2.7-SNAPSHOT</version>
     <relativePath>../../pom.xml</relativePath>
   </parent>
 
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>com.googlecode.libphonenumber</groupId>
       <artifactId>libphonenumber</artifactId>
-      <version>7.2.4-SNAPSHOT</version>
+      <version>7.2.7-SNAPSHOT</version>
     </dependency>
   </dependencies>
 

data/data/libphonenumber/java/libphonenumber/pom.xml

@@ -3,14 +3,14 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber</artifactId>
-  <version>7.2.4-SNAPSHOT</version>
+  <version>7.2.7-SNAPSHOT</version>
   <packaging>jar</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 
   <parent>
     <groupId>com.googlecode.libphonenumber</groupId>
     <artifactId>libphonenumber-parent</artifactId>
-    <version>7.2.4-SNAPSHOT</version>
+    <version>7.2.7-SNAPSHOT</version>
   </parent>
 
   <build>

data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/MultiFileMetadataSourceImpl.java

@@ -24,6 +24,7 @@ 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;
@@ -86,7 +87,14 @@ final class MultiFileMetadataSourceImpl implements MetadataSource {
   public PhoneMetadata getMetadataForNonGeographicalRegion(int countryCallingCode) {
     synchronized (countryCodeToNonGeographicalMetadataMap) {
       if (!countryCodeToNonGeographicalMetadataMap.containsKey(countryCallingCode)) {
-        loadMetadataFromFile(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode);
+        List<String> regionCodes =
+            CountryCodeToRegionCodeMap.getCountryCodeToRegionCodeMap().get(countryCallingCode);
+        // We can assume that if the country calling code maps to the non-geo entity region code
+        // then that's the only region code it maps to.
+        if (regionCodes.size() == 1 &&
+            PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCodes.get(0))) {
+          loadMetadataFromFile(PhoneNumberUtil.REGION_CODE_FOR_NON_GEO_ENTITY, countryCallingCode);
+        }
       }
     }
     return countryCodeToNonGeographicalMetadataMap.get(countryCallingCode);

data/data/libphonenumber/java/libphonenumber/src/com/google/i18n/phonenumbers/PhoneNumberUtil.java

@@ -552,7 +552,7 @@ public class PhoneNumberUtil {
   // load factor of roughly 0.75.
   private final Set<String> supportedRegions = new HashSet<String>(320);
 
-  // The set of county calling codes that map to the non-geo entity region ("001"). This set
+  // The set of country calling codes that map to the non-geo entity region ("001"). This set
   // currently contains < 12 elements so the default capacity of 16 (load factor=0.75) is fine.
   private final Set<Integer> countryCodesForNonGeographicalRegion = new HashSet<Integer>();
 
@@ -566,7 +566,7 @@ public class PhoneNumberUtil {
     this.countryCallingCodeToRegionCodeMap = countryCallingCodeToRegionCodeMap;
     for (Map.Entry<Integer, List<String>> entry : countryCallingCodeToRegionCodeMap.entrySet()) {
       List<String> regionCodes = entry.getValue();
-      // We can assume that if the county calling code maps to the non-geo entity region code then
+      // We can assume that if the country calling code maps to the non-geo entity region code then
       // that's the only region code it maps to.
       if (regionCodes.size() == 1 && REGION_CODE_FOR_NON_GEO_ENTITY.equals(regionCodes.get(0))) {
         // This is the subset of all country codes that map to the non-geo entity region code.

data/data/libphonenumber/java/pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.googlecode.libphonenumber</groupId>
   <artifactId>libphonenumber-parent</artifactId>
-  <version>7.2.4-SNAPSHOT</version>
+  <version>7.2.7-SNAPSHOT</version>
   <packaging>pom</packaging>
   <url>https://github.com/googlei18n/libphonenumber/</url>
 

data/data/libphonenumber/java/release_notes.txt

@@ -1,4 +1,47 @@
+Pending changes:
+Code changes:
+ - Update nationalPrefixOptionalWhenFormatting documentation.
+
+Feb 25, 2016: libphonenumber-7.2.6
+Metadata changes:
+ - Updated phone metadata for region code(s): DJ, MA, NA, US
+ - Updated short number metadata for region code(s): KR
+ - New geocoding data for country calling code(s): 1380 (en)
+ - Updated geocoding data for country calling code(s): 212 (en)
+
+Feb 10, 2016: libphonenumber-7.2.5
+Code changes:
+ - Fix two places in demo where NPEs can occur on bad input.
+ - Fix an IllegalStateException when getMetadataForNonGeographicalRegion is
+   called with a country calling code which isn't a non-geographic entity.
+Metadata changes:
+ - Updated phone metadata for region code(s):
+   AG, AI, AS, BB, BM, BS, CA, DM, DO, ET, GD, GU, JM, KN, KY, LC, MP, MS, PR,
+   SE, SK, SX, TC, TT, US, VC, VG, VI
+ - Updated geocoding data for country calling code(s): 46 (en)
+ - Updated carrier data for country calling code(s): 251 (en)
+
+Jan 28, 2016: libphonenumber-7.2.4
+ - First release to automatically remove obsolete geocoding files
+Metadata changes:
+ - Updated phone metadata for region code(s):
+   BW, CA, CI, CK, GM, IN, NA, NG, PG, TD, TM
+ - Updated short number metadata for region code(s): PT
+ - New geocoding data for country calling code(s): 1825 (en)
+ - Removed geocoding data for country calling code(s):
+   1726 (en), 1730 (en), 1838 (en), 1851 (en), 1888 (en), 225 (fr), 242 (fr),
+   269 (fr), 238(pt), 55 (pt)
+ - Updated carrier data for country calling code(s):
+   91 (en), 225 (en), 234 (en), 235 (en), 675 (en), 993 (en)
+
 Jan 08, 2016: libphonenumber-7.2.3
+Backwards-incompatible code changes:
+ - Removed deprecated ShortNumberUtil.java
+Other code changes:
+ - Updated the demo:
+   added short number support;
+   added permalink;
+   added direct link to file an issue
 Metadata changes:
  - Updated phone metadata for region code(s):
    AU, BR, CC, CR, CW, CX, ET, HN, KR, SI, TV, WF
@@ -6,11 +49,6 @@ Metadata changes:
  - New geocoding data for country calling code(s): 688 (en)
  - Updated carrier data for country calling code(s):
    61 (en), 251 (en), 506 (en), 599 (en)
- - Updated the demo:
-   added short number support;
-   added permalink;
-   added direct link to file an issue
- - Removed deprecated ShortNumberUtil.java
 
 Dec 15, 2015: libphonenumber-7.2.2
 Metadata changes:
@@ -24,10 +62,13 @@ Metadata changes:
    216 (en), 354 (en), 357 (en), 686 (en)
 
 Nov 11, 2015: libphonenumber-7.2.1
+ - Fix to libphonenumber-7.2.0
 Metadata changes: None
-Fix to 7.2.0
 
 Nov 10, 2015: libphonenumber-7.2.0
+* Broken, do not use *
+Code changes:
+ - Phonemetadata now generated as nanoproto
 Metadata changes:
  - Updated phone metadata for region code(s):
    BI, BT, IL, MN, MO, NP, RU, SK, VG
@@ -37,7 +78,6 @@ Metadata changes:
  - Updated carrier data for country calling code(s):
    45 (en), 257 (en), 421 (en), 964 (en), 972 (en), 975 (en), 976 (en)
  - Updated / refreshed time zone meta data.
- - Phonemetadata now generated as nanoproto
 
 Oct 29, 2015: libphonenumber-7.1.1
 Metadata changes: