[Payments] Format and validate phone number according to selected country in address editor

chrome/browser/autofill/android/phone_number_util_android.cc

 // Copyright 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/autofill/android/phone_number_util_android.h"
 
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "chrome/browser/browser_process.h"
 #include "components/autofill/core/browser/autofill_country.h"
 #include "jni/PhoneNumberUtil_jni.h"
 #include "third_party/libphonenumber/phonenumber_api.h"
 
 namespace autofill {
 
 namespace {
 using ::base::android::ConvertJavaStringToUTF8;
 using ::base::android::ConvertUTF8ToJavaString;
 using ::base::android::JavaParamRef;
 using ::base::android::ScopedJavaLocalRef;
 using ::i18n::phonenumbers::PhoneNumber;
 using ::i18n::phonenumbers::PhoneNumberUtil;
 
-// Formats the |phone_number| to the specified |format|. Returns the original
-// number if the operation is not possible.
-std::string FormatPhoneNumber(const std::string& phone_number,
-                              PhoneNumberUtil::PhoneNumberFormat format) {
-  const std::string default_region_code =
-      autofill::AutofillCountry::CountryCodeForLocale(
-          g_browser_process->GetApplicationLocale());
-
+// Formats the |phone_number| to the specified |format| for the given country
+// |country_code|. Returns the original number if the operation is not possible.
+std::string FormatPhoneNumberWithCountryCode(
+    const std::string& phone_number,
+    const std::string& country_code,
+    PhoneNumberUtil::PhoneNumberFormat format) {
   PhoneNumber parsed_number;
   PhoneNumberUtil* phone_number_util = PhoneNumberUtil::GetInstance();
-  if (phone_number_util->Parse(phone_number, default_region_code,
-                               &parsed_number) !=
+  if (phone_number_util->Parse(phone_number, country_code, &parsed_number) !=
       PhoneNumberUtil::NO_PARSING_ERROR) {
     return phone_number;
   }
 
   std::string formatted_number;
   phone_number_util->Format(parsed_number, format, &formatted_number);
   return formatted_number;
 }
 
+// Formats the |phone_number| to the specified |format|. Use application locale
+// to determine country code. Returns the original number if the operation is
+// not possible.
+std::string FormatPhoneNumber(const std::string& phone_number,
+                              PhoneNumberUtil::PhoneNumberFormat format) {
+  return FormatPhoneNumberWithCountryCode(
+      phone_number,
+      autofill::AutofillCountry::CountryCodeForLocale(
+          g_browser_process->GetApplicationLocale()),
+      format);
+}
+
+// Checks whether the given number |jphone_number| is valid by using
+// i18n::phonenumbers::PhoneNumberUtil::IsValidNumber.
+bool IsValidNumberImpl(const std::string& phone_number,
+                       const std::string& country_code) {
+  PhoneNumber parsed_number;
+  PhoneNumberUtil* phone_number_util = PhoneNumberUtil::GetInstance();
+  if (phone_number_util->Parse(phone_number, country_code, &parsed_number) !=
+      PhoneNumberUtil::NO_PARSING_ERROR) {
+    return false;
+  }
+
+  return phone_number_util->IsValidNumber(parsed_number);
+}
+
 }  // namespace
 
-// Formats the given number |jphone_number| to
+// Formats the given number |jphone_number| for the given country
+// |jcountry_code| to
 // i18n::phonenumbers::PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL format
 // by using i18n::phonenumbers::PhoneNumberUtil::Format.
 ScopedJavaLocalRef<jstring> FormatForDisplay(
     JNIEnv* env,
     const base::android::JavaParamRef<jclass>& jcaller,
-    const JavaParamRef<jstring>& jphone_number) {
-  return ConvertUTF8ToJavaString(
-      env,
-      FormatPhoneNumber(ConvertJavaStringToUTF8(env, jphone_number),
-                        PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL));
+    const JavaParamRef<jstring>& jphone_number,
+    const JavaParamRef<jstring>& jcountry_code) {
+  return jcountry_code.is_null()
+             ? ConvertUTF8ToJavaString(
+                   env, FormatPhoneNumber(

[please use gerrit instead, 2017/06/20 18:48:29]

The "jcountry_code.is_null() ? " check should go between "env," and "Format.."

[gogerald1, 2017/06/20 19:12:40]

Done.

+                            ConvertJavaStringToUTF8(env, jphone_number),
+                            PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL))
+             : ConvertUTF8ToJavaString(
+                   env, FormatPhoneNumberWithCountryCode(
+                            ConvertJavaStringToUTF8(env, jphone_number),
+                            ConvertJavaStringToUTF8(env, jcountry_code),
+                            PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL));
 }
 
 // Formats the given number |jphone_number| to
 // i18n::phonenumbers::PhoneNumberUtil::PhoneNumberFormat::E164 format by using
 // i18n::phonenumbers::PhoneNumberUtil::Format , as defined in the Payment
 // Request spec
 // (https://w3c.github.io/browser-payment-api/#paymentrequest-updated-algorithm)
 ScopedJavaLocalRef<jstring> FormatForResponse(
     JNIEnv* env,
     const base::android::JavaParamRef<jclass>& jcaller,
     const JavaParamRef<jstring>& jphone_number) {
   return ConvertUTF8ToJavaString(
       env, FormatPhoneNumber(ConvertJavaStringToUTF8(env, jphone_number),
                              PhoneNumberUtil::PhoneNumberFormat::E164));
 }
 
-// Checks whether the given number |jphone_number| is valid by using
-// i18n::phonenumbers::PhoneNumberUtil::IsValidNumber.
+// Checks whether the given number |jphone_number| is valid for a given country
+// |jcountry_code| by using i18n::phonenumbers::PhoneNumberUtil::IsValidNumber.
 jboolean IsValidNumber(JNIEnv* env,
                        const base::android::JavaParamRef<jclass>& jcaller,
-                       const JavaParamRef<jstring>& jphone_number) {
+                       const JavaParamRef<jstring>& jphone_number,
+                       const JavaParamRef<jstring>& jcountry_code) {
   const std::string phone_number = ConvertJavaStringToUTF8(env, jphone_number);
-  const std::string default_region_code =
-      autofill::AutofillCountry::CountryCodeForLocale(
-          g_browser_process->GetApplicationLocale());
+  const std::string country_code =
+      jcountry_code.is_null() ? autofill::AutofillCountry::CountryCodeForLocale(
+                                    g_browser_process->GetApplicationLocale())
+                              : ConvertJavaStringToUTF8(env, jcountry_code);
 
-  PhoneNumber parsed_number;
-  PhoneNumberUtil* phone_number_util = PhoneNumberUtil::GetInstance();
-  if (phone_number_util->Parse(phone_number, default_region_code,
-                               &parsed_number) !=
-      PhoneNumberUtil::NO_PARSING_ERROR) {
-    return false;
-  }
-
-  return phone_number_util->IsValidNumber(parsed_number);
+  return IsValidNumberImpl(phone_number, country_code);
 }
 
 }  // namespace autofill
 
 // static
 bool RegisterPhoneNumberUtil(JNIEnv* env) {
   return autofill::RegisterNativesImpl(env);
 }