Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1524)

Unified Diff: chrome/browser/autofill/android/phone_number_util_android.cc

Issue 2743763003: [Payments] Format and validate phone number by using libphonenumber (Closed)
Patch Set: fix tests Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/autofill/android/phone_number_util_android.cc
diff --git a/chrome/browser/autofill/android/phone_number_util_android.cc b/chrome/browser/autofill/android/phone_number_util_android.cc
new file mode 100644
index 0000000000000000000000000000000000000000..9022964fd5588f75c7b37ca1fb267dbdced9e906
--- /dev/null
+++ b/chrome/browser/autofill/android/phone_number_util_android.cc
@@ -0,0 +1,76 @@
+// 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"
+
+using base::android::ConvertJavaStringToUTF8;
+using base::android::ConvertUTF8ToJavaString;
+using base::android::JavaParamRef;
+using base::android::ScopedJavaLocalRef;
+using ::i18n::phonenumbers::PhoneNumber;
+using ::i18n::phonenumbers::PhoneNumberUtil;
+
+namespace autofill {
+
+// Formats the given number |jphone_number| by using
+// i18n::phonenumbers::PhoneNumberUtil::Format.
Mathieu 2017/03/14 00:36:23 Mention that we are choosing INTERNATIONAL and pro
gogerald1 2017/03/14 15:32:59 Done.
+ScopedJavaLocalRef<jstring> Format(
+ JNIEnv* env,
+ const base::android::JavaParamRef<jclass>& jcaller,
+ const JavaParamRef<jstring>& jphone_number) {
+ const std::string phone_number = ConvertJavaStringToUTF8(env, jphone_number);
+ const std::string default_region_code =
+ autofill::AutofillCountry::CountryCodeForLocale(
+ g_browser_process->GetApplicationLocale());
+
+ 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 ConvertUTF8ToJavaString(env, phone_number);
+ }
+
+ std::string formtted_number;
Mathieu 2017/03/14 00:36:23 *formatted
gogerald1 2017/03/14 15:32:59 Done.
+ phone_number_util->Format(parsed_number,
+ PhoneNumberUtil::PhoneNumberFormat::INTERNATIONAL,
+ &formtted_number);
+
+ return ConvertUTF8ToJavaString(env, formtted_number);
+}
+
+// Checks whether the given number |jphone_number| is valid by using
+// i18n::phonenumbers::PhoneNumberUtil::IsValidNumber.
+jboolean IsValidNumber(JNIEnv* env,
+ const base::android::JavaParamRef<jclass>& jcaller,
+ const JavaParamRef<jstring>& jphone_number) {
+ const std::string phone_number = ConvertJavaStringToUTF8(env, jphone_number);
+ const std::string default_region_code =
+ autofill::AutofillCountry::CountryCodeForLocale(
+ g_browser_process->GetApplicationLocale());
+
+ 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);
+}
+
+} // namespace autofill
+
+// static
+bool RegisterPhoneNumberUtil(JNIEnv* env) {
+ return autofill::RegisterNativesImpl(env);
+}

Powered by Google App Engine
This is Rietveld 408576698