[Payments] Update country codes in phone number validator and formatter for editing profile

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 52 matching lines @@
     }
 
     /**
      * 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 (TextUtils.isEmpty(phoneNumber)) mPhoneNumbers.add(phoneNumber.toString());
+        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 52 matching lines @@
                 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));
 
+        // Phone number validator and formatter are cached, so their contry code needs to be updated
+        // for the new profile that's being edited.
+        assert mCountryField.getValue() != null;
+        mPhoneValidator.setCountryCode(mCountryField.getValue().toString());
+        mPhoneFormatter.setCountryCode(mCountryField.getValue().toString());
+
         // There's a finite number of fields for address editing. Changing the country will re-order
         // and relabel the fields. The meaning of each field remains the same.
         if (mAddressFields.isEmpty()) {
             // City, dependent locality, and organization don't have any special formatting hints.
             mAddressFields.put(AddressField.LOCALITY, EditorFieldModel.createTextInput());
             mAddressFields.put(AddressField.DEPENDENT_LOCALITY, EditorFieldModel.createTextInput());
             mAddressFields.put(AddressField.ORGANIZATION, EditorFieldModel.createTextInput());
 
             // Sorting code and postal code (a.k.a. ZIP code) should show both letters and digits on
             // the keyboard, if possible.
             mAddressFields.put(AddressField.SORTING_CODE, EditorFieldModel.createTextInput(
                     EditorFieldModel.INPUT_TYPE_HINT_ALPHA_NUMERIC));
             mAddressFields.put(AddressField.POSTAL_CODE, EditorFieldModel.createTextInput(
                     EditorFieldModel.INPUT_TYPE_HINT_ALPHA_NUMERIC));
 
             // Street line field can contain \n to indicate line breaks.
             mAddressFields.put(AddressField.STREET_ADDRESS, EditorFieldModel.createTextInput(
                     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, 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());
@@ skipping 242 matching lines @@
         public boolean isValid(@Nullable CharSequence value) {
             return value != null && PhoneNumberUtil.isValidNumber(value.toString(), mCountryCode);
         }
 
         @Override
         public boolean isLengthMaximum(@Nullable CharSequence value) {
             return false;
         }
     }
 }