twcclegg · landrix · Dec 5, 2016 · Nov 25, 2016 · Nov 25, 2016
diff --git a/AUTHORS b/AUTHORS
@@ -1,3 +1,4 @@
 Google Inc.
+Vonage Holdings Corp.
 Ian Galpin
 Ben Gertzfield
diff --git a/README.md b/README.md
@@ -26,6 +26,15 @@ C# port of Google's [libphonenumber library](https://github.com/googlei18n/libph
   * AsYouTypeFormatter - formats phone numbers on-the-fly when users enter each digit.
   * FindNumbers - finds numbers in text input 
 
+## HowTo Update
+
+  * checkout the latest release from https://github.com/googlei18n/libphonenumber/releases
+  * synchronize all contained folders with this repository
+  * copy PhoneNumberMetaDataForTesting.xml PhoneNumberMetaData.xml PhoneNumberAlternateFormats.xml from /resources to /csharp/PhoneNumbers
+  * optional run /csharp/lib/makeprotobuf.bat
+  * modify AssemblyVersion and AssemblyFileVersion in /csharp/PhoneNumbers/Properties/AssemblyInfo.cs and /csharp/PhoneNumbers.Test/Properties/AssemblyInfo.cs
+  * make /csharp/PhoneNumbers.sln
+
 ## ToDo
 
 7.7.4 changes the organization of metadata https://groups.google.com/forum/#!topic/libphonenumber-discuss/GlS11RdyocQ

diff --git a/codereview.settings b/codereview.settings
@@ -1,4 +1,4 @@
 # This file is used by gcl to get repository specific information.
 CODE_REVIEW_SERVER: codereview.appspot.com
 TRY_ON_UPLOAD: False
-VIEW_VC: http://code.google.com/p/libphonenumber/source/detail?r=
+VIEW_VC: https://github.com/googlei18n/libphonenumber/commit/
diff --git a/cpp/src/phonenumbers/lite_metadata.cc b/cpp/src/phonenumbers/lite_metadata.cc
diff --git a/cpp/src/phonenumbers/matcher_api.h b/cpp/src/phonenumbers/matcher_api.h
@@ -39,13 +39,6 @@ class MatcherApi {
   virtual bool MatchesNationalNumber(const string& national_number,
                                      const PhoneNumberDesc& number_desc,
                                      bool allow_prefix_match) const = 0;
-
-  // Returns whether the given national number (a string containing only decimal
-  // digits) matches the possible number pattern defined in the given
-  // PhoneNumberDesc message.
-  virtual bool MatchesPossibleNumber(
-      const string& national_number,
-      const PhoneNumberDesc& number_desc) const = 0;
 };
 
 }  // namespace phonenumbers

diff --git a/cpp/src/phonenumbers/metadata.cc b/cpp/src/phonenumbers/metadata.cc
diff --git a/cpp/src/phonenumbers/phonenumber.cc b/cpp/src/phonenumbers/phonenumber.cc
@@ -68,18 +68,35 @@ bool ExactlySameAs(const PhoneNumberDesc& first_number_desc,
       second_number_desc.national_number_pattern()) {
     return false;
   }
-  if (first_number_desc.has_possible_number_pattern() !=
-      second_number_desc.has_possible_number_pattern() ||
-      first_number_desc.possible_number_pattern() !=
-      second_number_desc.possible_number_pattern()) {
-    return false;
-  }
   if (first_number_desc.has_example_number() !=
       second_number_desc.has_example_number() ||
       first_number_desc.example_number() !=
       second_number_desc.example_number()) {
     return false;
   }
+  if (first_number_desc.possible_length_size() !=
+      second_number_desc.possible_length_size()) {
+    return false;
+  } else {
+    for (int i = 0; i < first_number_desc.possible_length_size(); ++i) {
+      if (first_number_desc.possible_length(i) !=
+          second_number_desc.possible_length(i)) {
+        return false;
+      }
+    }
+  }
+  if (first_number_desc.possible_length_local_only_size() !=
+      second_number_desc.possible_length_local_only_size()) {
+    return false;
+  } else {
+    for (int i = 0; i < first_number_desc.possible_length_local_only_size();
+        ++i) {
+      if (first_number_desc.possible_length_local_only(i) !=
+          second_number_desc.possible_length_local_only(i)) {
+        return false;
+      }
+    }
+  }
   return true;
 }
 

diff --git a/cpp/src/phonenumbers/regex_based_matcher.cc b/cpp/src/phonenumbers/regex_based_matcher.cc
@@ -45,11 +45,6 @@ bool RegexBasedMatcher::MatchesNationalNumber(
                allow_prefix_match);
 }
 
-bool RegexBasedMatcher::MatchesPossibleNumber(
-    const string& national_number, const PhoneNumberDesc& number_desc) const {
-  return Match(national_number, number_desc.possible_number_pattern(), false);
-}
-
 bool RegexBasedMatcher::Match(const string& national_number,
                               const string& number_pattern,
                               bool allow_prefix_match) const {

diff --git a/cpp/src/phonenumbers/regex_based_matcher.h b/cpp/src/phonenumbers/regex_based_matcher.h
@@ -42,9 +42,6 @@ class RegexBasedMatcher : public MatcherApi {
                              const PhoneNumberDesc& number_desc,
                              bool allow_prefix_match) const;
 
-  bool MatchesPossibleNumber(const string& national_number,
-                             const PhoneNumberDesc& number_desc) const;
-
  private:
   bool Match(const string& national_number, const string& number_pattern,
              bool allow_prefix_match) const;

diff --git a/cpp/src/phonenumbers/short_metadata.cc b/cpp/src/phonenumbers/short_metadata.cc
diff --git a/cpp/src/phonenumbers/test_metadata.cc b/cpp/src/phonenumbers/test_metadata.cc
diff --git a/cpp/test/phonenumbers/phonenumberutil_test.cc b/cpp/test/phonenumbers/phonenumberutil_test.cc
@@ -221,11 +221,8 @@ TEST_F(PhoneNumberUtilTest, GetInstanceLoadUSMetadata) {
   EXPECT_EQ("$1 $2 $3", metadata->number_format(1).format());
   EXPECT_EQ("[13-689]\\d{9}|2[0-35-9]\\d{8}",
             metadata->general_desc().national_number_pattern());
-  EXPECT_EQ("\\d{7}(?:\\d{3})?",
-            metadata->general_desc().possible_number_pattern());
   EXPECT_EQ("[13-689]\\d{9}|2[0-35-9]\\d{8}",
             metadata->fixed_line().national_number_pattern());
-  EXPECT_EQ("\\d{10}", metadata->toll_free().possible_number_pattern());
   EXPECT_EQ(1, metadata->general_desc().possible_length_size());
   EXPECT_EQ(10, metadata->general_desc().possible_length(0));
   // Possible lengths are the same as the general description, so aren't stored
@@ -234,7 +231,6 @@ TEST_F(PhoneNumberUtilTest, GetInstanceLoadUSMetadata) {
   EXPECT_EQ("900\\d{7}", metadata->premium_rate().national_number_pattern());
   // No shared-cost data is available, so it should be initialised to "NA".
   EXPECT_EQ("NA", metadata->shared_cost().national_number_pattern());
-  EXPECT_EQ("NA", metadata->shared_cost().possible_number_pattern());
 }
 
 TEST_F(PhoneNumberUtilTest, GetInstanceLoadDEMetadata) {
@@ -257,9 +253,8 @@ TEST_F(PhoneNumberUtilTest, GetInstanceLoadDEMetadata) {
   EXPECT_EQ("$1 $2 $3", metadata->number_format(5).format());
   EXPECT_EQ("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}",
             metadata->fixed_line().national_number_pattern());
-  EXPECT_EQ("\\d{2,14}", metadata->fixed_line().possible_number_pattern());
   EXPECT_EQ("30123456", metadata->fixed_line().example_number());
-  EXPECT_EQ("\\d{10}", metadata->toll_free().possible_number_pattern());
+  EXPECT_EQ(10, metadata->toll_free().possible_length(0));
   EXPECT_EQ("900([135]\\d{6}|9\\d{7})",
             metadata->premium_rate().national_number_pattern());
 }

diff --git a/csharp/PhoneNumbers.Test/Properties/AssemblyInfo.cs b/csharp/PhoneNumbers.Test/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("7.7.4")]
-[assembly: AssemblyFileVersion("7.7.4")]
+[assembly: AssemblyVersion("7.7.5")]
+[assembly: AssemblyFileVersion("7.7.5")]
diff --git a/csharp/PhoneNumbers/PhoneNumberAlternateFormats.xml b/csharp/PhoneNumbers/PhoneNumberAlternateFormats.xml
@@ -42,12 +42,14 @@
     <!ELEMENT phoneNumberMetadata (territories)>
     <!ELEMENT territories (territory+)>
     <!ELEMENT territory (availableFormats)>
+    <!ELEMENT availableFormats (numberFormat+)>
     <!ELEMENT numberFormat (leadingDigits*, format, intlFormat*)>
     <!ELEMENT leadingDigits (#PCDATA)>
     <!ELEMENT format (#PCDATA)>
     <!ELEMENT intlFormat (#PCDATA)>
 
     <!ATTLIST territory countryCode CDATA #REQUIRED>
+    <!ATTLIST numberFormat nationalPrefixFormattingRule CDATA #IMPLIED>
     <!ATTLIST numberFormat pattern CDATA #REQUIRED>
 ]>