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

chrome/android/java/src/org/chromium/chrome/browser/payments/AddressEditor.java

 // Copyright 2016 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.
 
 package org.chromium.chrome.browser.payments;
 
 import android.app.ProgressDialog;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Pair;
@@ skipping 27 matching lines @@
         extends EditorBase<AutofillAddress> implements GetSubKeysRequestDelegate {
     private final Handler mHandler = new Handler();
     private final Map<Integer, EditorFieldModel> mAddressFields = new HashMap<>();
     private final Set<CharSequence> mPhoneNumbers = new HashSet<>();
     @Nullable
     private AutofillProfileBridge mAutofillProfileBridge;
     @Nullable
     private EditorFieldModel mCountryField;
     @Nullable
     private EditorFieldModel mPhoneField;
-    @Nullable
-    private EditorFieldValidator mPhoneValidator;
+    private PhoneNumberUtil.CountryAwareFormatTextWatcher mPhoneFormatter;
+    private PhoneNumberValidator mPhoneValidator;
     @Nullable
     private List<AddressUiComponent> mAddressUiComponents;
     private boolean mAdminAreasLoaded;
     private String mRecentlySelectedCountry;
     private Runnable mCountryChangeCallback;
     private AutofillProfile mProfile;
     private EditorModel mEditor;
     private ProgressDialog mProgressDialog;
 
+    /** Builds an address editor. */
+    public AddressEditor() {
+        mPhoneFormatter = new PhoneNumberUtil.CountryAwareFormatTextWatcher();
+        mPhoneValidator = new PhoneNumberValidator();

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

Both validator and phone number are "country-aware," but the reader of this line
would not get this idea. Please make the names of these classes consistent.

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

Done.

+    }
+
     /**
      * Adds the given phone number to the autocomplete set, if it's valid.
+     * Note that here we consider all non-null and non-empty numbers as valid
+     * since we are doing strict validation of Autofill data.
      *
      * @param phoneNumber The phone number to possibly add.
      */
     public void addPhoneNumberIfValid(@Nullable CharSequence phoneNumber) {
-        if (getPhoneValidator().isValid(phoneNumber)) mPhoneNumbers.add(phoneNumber);
+        if (TextUtils.isEmpty(phoneNumber)) mPhoneNumbers.add(phoneNumber.toString());
     }
 
     /**
      * Builds and shows an editor model with the following fields.
      *
      * [ country dropdown   ] <----- country dropdown is always present.
      * [ an address field   ] \
      * [ an address field   ]  \
      *         ...               <-- field order, presence, required, and labels depend on country.
      * [ an address field   ]  /
@@ skipping 41 matching lines @@
              * If the selected country on the country dropdown list is changed,
              * the first element of eventData is the recently selected dropdown key,
              * the second element is the callback to invoke for when the dropdown
              * change has been processed.
              */
             @Override
             public void onResult(Pair<String, Runnable> eventData) {
                 mEditor.removeAllFields();
                 showProgressDialog();
                 mRecentlySelectedCountry = eventData.first;
+                mPhoneFormatter.setCountryCode(mRecentlySelectedCountry);
+                mPhoneValidator.setCountryCode(mRecentlySelectedCountry);
                 mCountryChangeCallback = eventData.second;
                 loadAdminAreasForCountry(mRecentlySelectedCountry);
             }
         });
 
         // Country dropdown is cached, so the selected item needs to be updated for the new profile
         // that's being edited. This will not fire the dropdown callback.
         mCountryField.setValue(AutofillAddress.getCountryCode(mProfile));
 
         // There's a finite number of fields for address editing. Changing the country will re-order
@@ skipping 16 matching lines @@
                     EditorFieldModel.INPUT_TYPE_HINT_STREET_LINES));
 
             // Android has special formatting rules for names.
             mAddressFields.put(AddressField.RECIPIENT, EditorFieldModel.createTextInput(
                     EditorFieldModel.INPUT_TYPE_HINT_PERSON_NAME));
         }
 
 
         // Phone number is present and required for all countries.
         if (mPhoneField == null) {
+            assert mCountryField.getValue() != null;
+            mPhoneValidator.setCountryCode(mCountryField.getValue().toString());
+            mPhoneFormatter.setCountryCode(mCountryField.getValue().toString());
             mPhoneField = EditorFieldModel.createTextInput(EditorFieldModel.INPUT_TYPE_HINT_PHONE,
                     mContext.getString(R.string.autofill_profile_editor_phone_number),
-                    mPhoneNumbers, getPhoneValidator(), null,
+                    mPhoneNumbers, mPhoneFormatter, mPhoneValidator, null,
                     mContext.getString(R.string.payments_field_required_validation_message),
                     mContext.getString(R.string.payments_phone_invalid_validation_message), null);
         }
 
         // Phone number field is cached, so its value needs to be updated for every new profile
         // that's being edited.
         mPhoneField.setValue(mProfile.getPhoneNumber());
 
         // If the user clicks [Cancel], send |toEdit| address back to the caller, which was the
         // original state (could be null, a complete address, a partial address).
@@ skipping 214 matching lines @@
                         R.string.payments_field_required_validation_message));
             } else {
                 field.setRequiredErrorMessage(null);
             }
             mEditor.addField(field);
         }
         // Phone number must be the last field.
         mEditor.addField(mPhoneField);
     }
 
-    private EditorFieldValidator getPhoneValidator() {
-        if (mPhoneValidator == null) {
-            mPhoneValidator = new EditorFieldValidator() {
-                @Override
-                public boolean isValid(@Nullable CharSequence value) {
-                    return value != null && PhoneNumberUtil.isValidNumber(value.toString());
-                }
+    /** Country based phone number validator. */
+    private class PhoneNumberValidator implements EditorFieldValidator {
+        @Nullable
+        private String mCountryCode;
 
-                @Override
-                public boolean isLengthMaximum(@Nullable CharSequence value) {
-                    return false;
-                }
-            };
+        /**
+         * Sets the country code used to validate the phone number.
+         *
+         * @param countryCode The given country code.
+         */
+        public void setCountryCode(@Nullable String countryCode) {
+            mCountryCode = countryCode;
         }
-        return mPhoneValidator;
+
+        @Override
+        public boolean isValid(@Nullable CharSequence value) {
+            return value != null && PhoneNumberUtil.isValidNumber(value.toString(), mCountryCode);
+        }
+
+        @Override
+        public boolean isLengthMaximum(@Nullable CharSequence value) {
+            return false;
+        }
     }
 }