[Contacts] Use ContactsContract API in Android to get Address info.

Grab address info in the contacts fetcher task, and pipe down to the
address provider to create a mojo address object.

Bug: 1016870
Change-Id: I4d0580f0c27cbaef813cb2374b010ad182cb64d4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879240Reviewed-by: Finnur Thorarinsson <finnur@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Commit-Queue: Rayan Kanso <rayankans@chromium.org>
Cr-Commit-Position: refs/heads/master@{#711285}

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ContactDetails.java

@@ -9,6 +9,7 @@ import android.content.res.Resources;
 import androidx.annotation.Nullable;
 
 import org.chromium.chrome.R;
+import org.chromium.payments.mojom.PaymentAddress;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -42,19 +43,24 @@ public class ContactDetails implements Comparable<ContactDetails> {
     // The list of phone numbers registered for this contact.
     private final List<String> mPhoneNumbers;
 
+    // The list of addresses registered for this contact.
+    private final List<PaymentAddress> mAddresses;
+
     /**
      * The ContactDetails constructor.
      * @param id The unique identifier of this contact.
      * @param displayName The display name of this contact.
      * @param emails The emails registered for this contact.
      * @param phoneNumbers The phone numbers registered for this contact.
+     * @param addresses The addresses registered for this contact.
      */
-    public ContactDetails(
-            String id, String displayName, List<String> emails, List<String> phoneNumbers) {
+    public ContactDetails(String id, String displayName, List<String> emails,
+            List<String> phoneNumbers, List<PaymentAddress> addresses) {
         mDisplayName = displayName;
-        mEmails = emails != null ? new ArrayList<String>(emails) : new ArrayList<String>();
-        mPhoneNumbers = phoneNumbers != null ? new ArrayList<String>(phoneNumbers)
-                                             : new ArrayList<String>();
+        mEmails = emails != null ? emails : new ArrayList<String>();
+        mPhoneNumbers = phoneNumbers != null ? phoneNumbers : new ArrayList<String>();
+        mAddresses = addresses != null ? addresses : new ArrayList<PaymentAddress>();
+
         mId = id;
     }
 
@@ -70,6 +76,10 @@ public class ContactDetails implements Comparable<ContactDetails> {
         return mPhoneNumbers;
     }
 
+    public List<PaymentAddress> getAddresses() {
+        return mAddresses;
+    }
+
     public String getDisplayName() {
         return mDisplayName;
     }

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ContactsFetcherWorkerTask.java

@@ -11,6 +11,7 @@ import android.provider.ContactsContract;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.task.AsyncTask;
+import org.chromium.payments.mojom.PaymentAddress;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -52,6 +53,9 @@ class ContactsFetcherWorkerTask extends AsyncTask<ArrayList<ContactDetails>> {
     // Whether to include telephones in the data fetched.
     private final boolean mIncludeTel;
 
+    // Whether to include addresses in the data fetched.
+    private final boolean mIncludeAddresses;
+
     /**
      * A ContactsFetcherWorkerTask constructor.
      * @param contentResolver The ContentResolver to use to fetch the contacts data.
@@ -59,15 +63,17 @@ class ContactsFetcherWorkerTask extends AsyncTask<ArrayList<ContactDetails>> {
      * @param includeNames Whether names were requested by the website.
      * @param includeEmails Whether to include emails in the data fetched.
      * @param includeTel Whether to include telephones in the data fetched.
+     * @param includeAddresses Whether to include telephones in the data fetched.
      */
     public ContactsFetcherWorkerTask(ContentResolver contentResolver,
             ContactsRetrievedCallback callback, boolean includeNames, boolean includeEmails,
-            boolean includeTel) {
+            boolean includeTel, boolean includeAddresses) {
         mContentResolver = contentResolver;
         mCallback = callback;
         mIncludeNames = includeNames;
         mIncludeEmails = includeEmails;
         mIncludeTel = includeTel;
+        mIncludeAddresses = includeAddresses;
     }
 
     /**
@@ -103,6 +109,7 @@ class ContactsFetcherWorkerTask extends AsyncTask<ArrayList<ContactDetails>> {
         while (cursor.moveToNext()) {
             String id = cursor.getString(cursor.getColumnIndex(idColumn));
             value = cursor.getString(cursor.getColumnIndex(dataColumn));
+            if (value == null) value = "";
             if (key.isEmpty()) {
                 key = id;
                 list.add(value);
@@ -123,6 +130,76 @@ class ContactsFetcherWorkerTask extends AsyncTask<ArrayList<ContactDetails>> {
         return map;
     }
 
+    /** Creates a PaymentAddress mojo struct. */
+    private PaymentAddress createAddress(
+            String city, String country, String formattedAddress, String postcode, String region) {
+        PaymentAddress address = new PaymentAddress();
+
+        address.city = city != null ? city : "";
+        address.country = country != null ? country : "";
+        address.addressLine =
+                formattedAddress != null ? new String[] {formattedAddress} : new String[] {};
+        address.postalCode = postcode != null ? postcode : "";
+        address.region = region != null ? region : "";
+
+        // The other fields are required.
+        address.dependentLocality = "";
+        address.sortingCode = "";
+        address.organization = "";
+        address.recipient = "";
+        address.phone = "";
+
+        return address;
+    }
+
+    /** Fetches all available address info for contacts. */
+    private Map<String, ArrayList<PaymentAddress>> getAddressDetails() {
+        Map<String, ArrayList<PaymentAddress>> map = new HashMap<>();
+
+        String addressSortOrder = ContactsContract.CommonDataKinds.StructuredPostal.CONTACT_ID
+                + " ASC, " + ContactsContract.CommonDataKinds.StructuredPostal.DATA + " ASC";
+        Cursor cursor = mContentResolver.query(
+                ContactsContract.CommonDataKinds.StructuredPostal.CONTENT_URI, null, null, null,
+                addressSortOrder);
+
+        ArrayList<PaymentAddress> list = new ArrayList<>();
+        String key = "";
+
+        while (cursor.moveToNext()) {
+            String id = cursor.getString(cursor.getColumnIndex(
+                    ContactsContract.CommonDataKinds.StructuredPostal.CONTACT_ID));
+            String city = cursor.getString(
+                    cursor.getColumnIndex(ContactsContract.CommonDataKinds.StructuredPostal.CITY));
+            String country = cursor.getString(cursor.getColumnIndex(
+                    ContactsContract.CommonDataKinds.StructuredPostal.COUNTRY));
+            String formattedAddress = cursor.getString(cursor.getColumnIndex(
+                    ContactsContract.CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS));
+            String postcode = cursor.getString(cursor.getColumnIndex(
+                    ContactsContract.CommonDataKinds.StructuredPostal.POSTCODE));
+            String region = cursor.getString(cursor.getColumnIndex(
+                    ContactsContract.CommonDataKinds.StructuredPostal.REGION));
+            PaymentAddress address =
+                    createAddress(city, country, formattedAddress, postcode, region);
+            if (key.isEmpty()) {
+                key = id;
+                list.add(address);
+            } else {
+                if (key.equals(id)) {
+                    list.add(address);
+                } else {
+                    map.put(key, list);
+                    list = new ArrayList<>();
+                    list.add(address);
+                    key = id;
+                }
+            }
+        }
+        map.put(key, list);
+        cursor.close();
+
+        return map;
+    }
+
     /**
      * Fetches all known contacts.
      * @return The contact list as an array.
@@ -139,11 +216,14 @@ class ContactsFetcherWorkerTask extends AsyncTask<ArrayList<ContactDetails>> {
         Map<String, ArrayList<String>> phoneMap = mIncludeTel
                 ? getDetails(ContactsContract.CommonDataKinds.Phone.CONTENT_URI,
                         ContactsContract.CommonDataKinds.Phone.CONTACT_ID,
-                        ContactsContract.CommonDataKinds.Email.DATA,
-                        ContactsContract.CommonDataKinds.Email.CONTACT_ID + " ASC, "
+                        ContactsContract.CommonDataKinds.Phone.DATA,
+                        ContactsContract.CommonDataKinds.Phone.CONTACT_ID + " ASC, "
                                 + ContactsContract.CommonDataKinds.Phone.NUMBER + " ASC")
                 : null;
 
+        Map<String, ArrayList<PaymentAddress>> addressMap =
+                mIncludeAddresses ? getAddressDetails() : null;
+
         // A cursor containing the raw contacts data.
         Cursor cursor = mContentResolver.query(ContactsContract.Contacts.CONTENT_URI, PROJECTION,
                 null, null, ContactsContract.Contacts.SORT_KEY_PRIMARY + " ASC");
@@ -156,8 +236,11 @@ class ContactsFetcherWorkerTask extends AsyncTask<ArrayList<ContactDetails>> {
                     cursor.getColumnIndex(ContactsContract.Contacts.DISPLAY_NAME_PRIMARY));
             List<String> email = mIncludeEmails ? emailMap.get(id) : null;
             List<String> tel = mIncludeTel ? phoneMap.get(id) : null;
-            if (mIncludeNames || email != null || tel != null)
-                contacts.add(new ContactDetails(id, name, email, tel));
+            List<PaymentAddress> address = mIncludeAddresses ? addressMap.get(id) : null;
+
+            if (mIncludeNames || email != null || tel != null || address != null) {
+                contacts.add(new ContactDetails(id, name, email, tel, address));
+            }
         } while (cursor.moveToNext());
 
         cursor.close();

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/ContactsPickerDialog.java

@@ -28,17 +28,18 @@ public class ContactsPickerDialog
      * @param includeNames Whether the contacts data returned includes names.
      * @param includeEmails Whether the contacts data returned includes emails.
      * @param includeTel Whether the contacts data returned includes telephone numbers.
+     * @param includeAddresses Whether the contacts data returned includes addresses.
      * @param formattedOrigin The origin the data will be shared with, formatted for display with
      *                        the scheme omitted.
      */
     public ContactsPickerDialog(Context context, ContactsPickerListener listener,
             boolean allowMultiple, boolean includeNames, boolean includeEmails, boolean includeTel,
-            String formattedOrigin) {
+            boolean includeAddresses, String formattedOrigin) {
         super(context, R.style.Theme_Chromium_Fullscreen);
 
         // Initialize the main content view.
         mCategoryView = new PickerCategoryView(context, allowMultiple, includeNames, includeEmails,
-                includeTel, formattedOrigin, this);
+                includeTel, includeAddresses, formattedOrigin, this);
         mCategoryView.initialize(this, listener);
         setView(mCategoryView);
     }

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/PickerAdapter.java

@@ -124,7 +124,7 @@ public class PickerAdapter extends Adapter<RecyclerView.ViewHolder>
         if (getAllContacts() == null && sTestContacts == null) {
             mWorkerTask = new ContactsFetcherWorkerTask(mContentResolver, this,
                     mCategoryView.includeNames, mCategoryView.includeEmails,
-                    mCategoryView.includeTel);
+                    mCategoryView.includeTel, mCategoryView.includeAddresses);
             mWorkerTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
         } else {
             mContactDetails = sTestContacts;

chrome/android/java/src/org/chromium/chrome/browser/contacts_picker/PickerCategoryView.java

@@ -113,6 +113,9 @@ public class PickerCategoryView extends OptimizedFrameLayout
     // Whether the contacts data returned includes telephone numbers.
     public final boolean includeTel;
 
+    // Whether the contacts data returned includes addresses.
+    public final boolean includeAddresses;
+
     /**
      * @param multiSelectionAllowed Whether the contacts picker should allow multiple items to be
      * selected.
@@ -120,7 +123,8 @@ public class PickerCategoryView extends OptimizedFrameLayout
     @SuppressWarnings("unchecked") // mSelectableListLayout
     public PickerCategoryView(Context context, boolean multiSelectionAllowed,
             boolean shouldIncludeNames, boolean shouldIncludeEmails, boolean shouldIncludeTel,
-            String formattedOrigin, ContactsPickerToolbar.ContactsToolbarDelegate delegate) {
+            boolean shouldIncludeAddresses, String formattedOrigin,
+            ContactsPickerToolbar.ContactsToolbarDelegate delegate) {
         super(context, null);
 
         mActivity = (ChromeActivity) context;
@@ -128,6 +132,7 @@ public class PickerCategoryView extends OptimizedFrameLayout
         includeNames = shouldIncludeNames;
         includeEmails = shouldIncludeEmails;
         includeTel = shouldIncludeTel;
+        includeAddresses = shouldIncludeAddresses;
 
         mSelectionDelegate = new SelectionDelegate<ContactDetails>();
         if (!multiSelectionAllowed) mSelectionDelegate.setSingleSelectionMode();
@@ -326,8 +331,8 @@ public class PickerCategoryView extends OptimizedFrameLayout
      * @param selected The property values that are currently selected.
      * @return The list of property values to share.
      */
-    private List<String> getContactPropertyValues(
-            boolean isIncluded, boolean isEnabled, List<String> selected) {
+    private <T> List<T> getContactPropertyValues(
+            boolean isIncluded, boolean isEnabled, List<T> selected) {
         if (!isIncluded) {
             // The property wasn't requested in the API so return null.
             return null;
@@ -335,7 +340,7 @@ public class PickerCategoryView extends OptimizedFrameLayout
 
         if (!isEnabled) {
             // The user doesn't want to share this property, so return an empty array.
-            return new ArrayList<String>();
+            return new ArrayList<T>();
         }
 
         // Share whatever was selected.
@@ -359,7 +364,10 @@ public class PickerCategoryView extends OptimizedFrameLayout
                     getContactPropertyValues(includeEmails, PickerAdapter.includesEmails(),
                             contactDetails.getEmails()),
                     getContactPropertyValues(includeTel, PickerAdapter.includesTelephones(),
-                            contactDetails.getPhoneNumbers())));
+                            contactDetails.getPhoneNumbers()),
+                    // TODO(crbug.com/1016870): Check the address chip when added.
+                    getContactPropertyValues(
+                            includeAddresses, true, contactDetails.getAddresses())));
         }
         executeAction(ContactsPickerListener.ContactsPickerAction.CONTACTS_SELECTED, contacts,
                 ACTION_CONTACTS_SELECTED);
@@ -383,6 +391,9 @@ public class PickerCategoryView extends OptimizedFrameLayout
             propertiesRequested |= ContactsPickerPropertiesRequested.PROPERTIES_EMAILS;
         }
         if (includeTel) propertiesRequested |= ContactsPickerPropertiesRequested.PROPERTIES_TELS;
+        if (includeAddresses) {
+            propertiesRequested |= ContactsPickerPropertiesRequested.PROPERTIES_ADDRESSES;
+        }
 
         mListener.onContactsPickerUserAction(
                 action, contacts, percentageShared, propertiesRequested);

chrome/android/java/src/org/chromium/chrome/browser/init/ProcessInitializationHandler.java

@@ -260,9 +260,9 @@ public class ProcessInitializationHandler {
             @Override
             public void showContactsPicker(Context context, ContactsPickerListener listener,
                     boolean allowMultiple, boolean includeNames, boolean includeEmails,
-                    boolean includeTel, String formattedOrigin) {
+                    boolean includeTel, boolean includeAddresses, String formattedOrigin) {
                 mDialog = new ContactsPickerDialog(context, listener, allowMultiple, includeNames,
-                        includeEmails, includeTel, formattedOrigin);
+                        includeEmails, includeTel, includeAddresses, formattedOrigin);
                 mDialog.getWindow().getAttributes().windowAnimations =
                         R.style.PickerDialogAnimation;
                 mDialog.show();

chrome/android/javatests/src/org/chromium/chrome/browser/contacts_picker/ContactsPickerDialogTest.java

@@ -34,6 +34,7 @@ import org.chromium.chrome.test.util.browser.Features;
 import org.chromium.chrome.test.util.browser.RecyclerViewTestUtils;
 import org.chromium.content_public.browser.test.util.TestThreadUtils;
 import org.chromium.content_public.browser.test.util.TestTouchUtils;
+import org.chromium.payments.mojom.PaymentAddress;
 import org.chromium.ui.ContactsPickerListener;
 
 import java.util.ArrayList;
@@ -94,13 +95,31 @@ public class ContactsPickerDialogTest
     public void setUp() throws Exception {
         mActivityTestRule.startMainActivityOnBlankPage();
         mTestContacts = new ArrayList<ContactDetails>();
-        mTestContacts.add(new ContactDetails(
-                "0", "Contact 0", Arrays.asList("0@example.com"), Arrays.asList("555-1234")));
-        mTestContacts.add(new ContactDetails("1", "Contact 1", null, null));
-        mTestContacts.add(new ContactDetails("2", "Contact 2", null, null));
-        mTestContacts.add(new ContactDetails("3", "Contact 3", null, null));
-        mTestContacts.add(new ContactDetails("4", "Contact 4", null, null));
-        mTestContacts.add(new ContactDetails("5", "Contact 5", null, null));
+
+        PaymentAddress address = new PaymentAddress();
+        address.city = "city";
+        address.country = "country";
+        address.addressLine = new String[] {"formattedAddress"};
+        address.postalCode = "postalCode";
+        address.region = "region";
+        address.dependentLocality = "";
+        address.sortingCode = "";
+        address.organization = "";
+        address.recipient = "";
+        address.phone = "";
+
+        mTestContacts.add(new ContactDetails("0", "Contact 0", Arrays.asList("0@example.com"),
+                Arrays.asList("555-1234"), Arrays.asList(address)));
+        mTestContacts.add(new ContactDetails("1", "Contact 1", /*emails=*/null,
+                /*phoneNumbers=*/null, /*addresses=*/null));
+        mTestContacts.add(new ContactDetails("2", "Contact 2", /*emails=*/null,
+                /*phoneNumbers=*/null, /*addresses=*/null));
+        mTestContacts.add(new ContactDetails("3", "Contact 3", /*emails=*/null,
+                /*phoneNumbers=*/null, /*addresses=*/null));
+        mTestContacts.add(new ContactDetails("4", "Contact 4", /*emails=*/null,
+                /*phoneNumbers=*/null, /*addresses=*/null));
+        mTestContacts.add(new ContactDetails("5", "Contact 5", /*emails=*/null,
+                /*phoneNumbers=*/null, /*addresses=*/null));
         PickerAdapter.setTestContacts(mTestContacts);
 
         Bitmap bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
@@ -135,7 +154,8 @@ public class ContactsPickerDialogTest
     }
 
     private ContactsPickerDialog createDialog(final boolean multiselect, final boolean includeNames,
-            final boolean includeEmails, final boolean includeTel) throws Exception {
+            final boolean includeEmails, final boolean includeTel, final boolean includeAddresses)
+            throws Exception {
         mClosing = false;
         final ContactsPickerDialog dialog =
                 TestThreadUtils.runOnUiThreadBlocking(new Callable<ContactsPickerDialog>() {
@@ -144,7 +164,7 @@ public class ContactsPickerDialogTest
                         final ContactsPickerDialog dialog =
                                 new ContactsPickerDialog(mActivityTestRule.getActivity(),
                                         ContactsPickerDialogTest.this, multiselect, includeNames,
-                                        includeEmails, includeTel, "example.com");
+                                        includeEmails, includeTel, includeAddresses, "example.com");
                         dialog.show();
                         return dialog;
                     }
@@ -273,7 +293,8 @@ public class ContactsPickerDialogTest
     public void testOriginString() throws Throwable {
         createDialog(/* multiselect = */ true, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         TopView topView = getTopView();
@@ -292,7 +313,8 @@ public class ContactsPickerDialogTest
     public void testFilterVisibilityForDataInclusion() throws Throwable {
         createDialog(/* multiselect = */ false, /* includeNames = */ true,
                 /* includeEmails = */ false,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ false);
         Assert.assertTrue(mDialog.isShowing());
 
         TopView topView = getTopView();
@@ -310,6 +332,7 @@ public class ContactsPickerDialogTest
         Assert.assertEquals(namesFilter.getVisibility(), View.VISIBLE);
         Assert.assertEquals(emailFilter.getVisibility(), View.GONE);
         Assert.assertEquals(telFilter.getVisibility(), View.VISIBLE);
+        // TODO(crbug.com/1016870): Add a false test for the filter chip, when added.
     }
 
     @Test
@@ -317,7 +340,8 @@ public class ContactsPickerDialogTest
     public void testNoSelection() throws Throwable {
         createDialog(/* multiselect = */ false, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         int expectedSelectionCount = 1;
@@ -326,7 +350,7 @@ public class ContactsPickerDialogTest
 
         Assert.assertEquals(null, mLastSelectedContacts);
         Assert.assertEquals(0, mLastPercentageShared);
-        Assert.assertEquals(7, mLastPropertiesRequested);
+        Assert.assertEquals(15, mLastPropertiesRequested);
         Assert.assertEquals(ContactsPickerAction.CANCEL, mLastActionRecorded);
     }
 
@@ -335,7 +359,8 @@ public class ContactsPickerDialogTest
     public void testSingleSelectionContacts() throws Throwable {
         createDialog(/* multiselect = */ false, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         // Expected selection count is 1 because clicking on a new view deselects other.
@@ -349,7 +374,7 @@ public class ContactsPickerDialogTest
         Assert.assertEquals(
                 mTestContacts.get(1).getDisplayName(), mLastSelectedContacts.get(0).names.get(0));
         Assert.assertEquals(16, mLastPercentageShared);
-        Assert.assertEquals(7, mLastPropertiesRequested);
+        Assert.assertEquals(15, mLastPropertiesRequested);
     }
 
     @Test
@@ -357,7 +382,8 @@ public class ContactsPickerDialogTest
     public void testMultiSelectionContacts() throws Throwable {
         createDialog(/* multiselect = */ true, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         // Multi-selection is enabled, so each click is counted.
@@ -376,7 +402,7 @@ public class ContactsPickerDialogTest
         Assert.assertEquals(
                 mTestContacts.get(0).getDisplayName(), mLastSelectedContacts.get(2).names.get(0));
         Assert.assertEquals(50, mLastPercentageShared);
-        Assert.assertEquals(7, mLastPropertiesRequested);
+        Assert.assertEquals(15, mLastPropertiesRequested);
     }
 
     @Test
@@ -384,7 +410,8 @@ public class ContactsPickerDialogTest
     public void testNamesRemoved() throws Throwable {
         createDialog(/* multiselect = */ false, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         toggleFilter(PickerAdapter.FilterType.NAMES);
@@ -398,8 +425,20 @@ public class ContactsPickerDialogTest
         Assert.assertEquals(new ArrayList<String>(), mLastSelectedContacts.get(0).names);
         Assert.assertEquals(mTestContacts.get(0).getEmails().get(0),
                 mLastSelectedContacts.get(0).emails.get(0));
+        Assert.assertEquals(mTestContacts.get(0).getPhoneNumbers().get(0),
+                mLastSelectedContacts.get(0).tel.get(0));
+
+        PaymentAddress selectedAddress =
+                PaymentAddress.deserialize(mLastSelectedContacts.get(0).serializedAddresses.get(0));
+        PaymentAddress testAddress = mTestContacts.get(0).getAddresses().get(0);
+        Assert.assertEquals(selectedAddress.city, testAddress.city);
+        Assert.assertEquals(selectedAddress.country, testAddress.country);
+        Assert.assertEquals(selectedAddress.addressLine[0], testAddress.addressLine[0]);
+        Assert.assertEquals(selectedAddress.postalCode, testAddress.postalCode);
+        Assert.assertEquals(selectedAddress.region, testAddress.region);
+
         Assert.assertEquals(16, mLastPercentageShared);
-        Assert.assertEquals(7, mLastPropertiesRequested);
+        Assert.assertEquals(15, mLastPropertiesRequested);
     }
 
     @Test
@@ -407,7 +446,8 @@ public class ContactsPickerDialogTest
     public void testEmailsRemoved() throws Throwable {
         createDialog(/* multiselect = */ false, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         toggleFilter(PickerAdapter.FilterType.EMAILS);
@@ -422,7 +462,7 @@ public class ContactsPickerDialogTest
                 mTestContacts.get(0).getDisplayName(), mLastSelectedContacts.get(0).names.get(0));
         Assert.assertEquals(new ArrayList<String>(), mLastSelectedContacts.get(0).emails);
         Assert.assertEquals(16, mLastPercentageShared);
-        Assert.assertEquals(7, mLastPropertiesRequested);
+        Assert.assertEquals(15, mLastPropertiesRequested);
     }
 
     @Test
@@ -430,7 +470,8 @@ public class ContactsPickerDialogTest
     public void testTelephonesRemoved() throws Throwable {
         createDialog(/* multiselect = */ false, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         toggleFilter(PickerAdapter.FilterType.TELEPHONES);
@@ -445,7 +486,7 @@ public class ContactsPickerDialogTest
                 mTestContacts.get(0).getDisplayName(), mLastSelectedContacts.get(0).names.get(0));
         Assert.assertEquals(new ArrayList<String>(), mLastSelectedContacts.get(0).tel);
         Assert.assertEquals(16, mLastPercentageShared);
-        Assert.assertEquals(7, mLastPropertiesRequested);
+        Assert.assertEquals(15, mLastPropertiesRequested);
     }
 
     @Test
@@ -454,7 +495,8 @@ public class ContactsPickerDialogTest
         // Create a dialog showing names only.
         createDialog(/* multiselect = */ false, /* includeNames = */ true,
                 /* includeEmails = */ false,
-                /* includeTel = */ false);
+                /* includeTel = */ false,
+                /* includeAddresses = */ false);
         Assert.assertTrue(mDialog.isShowing());
         clickCancel();
         Assert.assertEquals(4, mLastPropertiesRequested);
@@ -462,7 +504,8 @@ public class ContactsPickerDialogTest
         // Create a dialog showing emails only.
         createDialog(/* multiselect = */ false, /* includeNames = */ false,
                 /* includeEmails = */ true,
-                /* includeTel = */ false);
+                /* includeTel = */ false,
+                /* includeAddresses = */ false);
         Assert.assertTrue(mDialog.isShowing());
         clickCancel();
         Assert.assertEquals(2, mLastPropertiesRequested);
@@ -470,10 +513,20 @@ public class ContactsPickerDialogTest
         // Create a dialog showing telephone numbers only.
         createDialog(/* multiselect = */ false, /* includeNames = */ false,
                 /* includeEmails = */ false,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ false);
         Assert.assertTrue(mDialog.isShowing());
         clickCancel();
         Assert.assertEquals(1, mLastPropertiesRequested);
+
+        // Create a dialog showing addresses only.
+        createDialog(/* multiselect = */ false, /* includeNames = */ false,
+                /* includeEmails = */ false,
+                /* includeTel = */ false,
+                /* includeAddresses = */ true);
+        Assert.assertTrue(mDialog.isShowing());
+        clickCancel();
+        Assert.assertEquals(8, mLastPropertiesRequested);
     }
 
     @Test
@@ -481,7 +534,8 @@ public class ContactsPickerDialogTest
     public void testSelectAll() throws Throwable {
         createDialog(/* multiselect = */ true, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         toggleSelectAll(6, ContactsPickerAction.SELECT_ALL);
@@ -510,7 +564,8 @@ public class ContactsPickerDialogTest
     public void testNoSearchStringNoCrash() throws Throwable {
         createDialog(/* multiselect = */ true, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         clickSearchButton();
@@ -524,7 +579,8 @@ public class ContactsPickerDialogTest
 
         createDialog(/* multiselect = */ true, /* includeNames = */ true,
                 /* includeEmails = */ true,
-                /* includeTel = */ true);
+                /* includeTel = */ true,
+                /* includeAddresses = */ true);
         Assert.assertTrue(mDialog.isShowing());
 
         dismissDialog();

content/browser/contacts/contacts_provider_android.cc

@@ -63,41 +63,56 @@ void ContactsProviderAndroid::Select(bool multiple,
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContactsDialogHost_showDialog(
       env, dialog_, multiple, include_names, include_emails, include_tel,
+      include_addresses,
       base::android::ConvertUTF16ToJavaString(env, formatted_origin_));
 }
 
 void ContactsProviderAndroid::AddContact(
     JNIEnv* env,
-    jboolean include_names,
-    jboolean include_emails,
-    jboolean include_tel,
     const base::android::JavaParamRef<jobjectArray>& names_java,
     const base::android::JavaParamRef<jobjectArray>& emails_java,
-    const base::android::JavaParamRef<jobjectArray>& tel_java) {
+    const base::android::JavaParamRef<jobjectArray>& tel_java,
+    const base::android::JavaParamRef<jobjectArray>& addresses_java) {
   DCHECK(callback_);
 
   base::Optional<std::vector<std::string>> names;
-  if (include_names) {
+  if (names_java) {
     std::vector<std::string> names_vector;
     AppendJavaStringArrayToStringVector(env, names_java, &names_vector);
-    names = names_vector;
+    names = std::move(names_vector);
   }
 
   base::Optional<std::vector<std::string>> emails;
-  if (include_emails) {
+  if (emails_java) {
     std::vector<std::string> emails_vector;
     AppendJavaStringArrayToStringVector(env, emails_java, &emails_vector);
-    emails = emails_vector;
+    emails = std::move(emails_vector);
   }
 
   base::Optional<std::vector<std::string>> tel;
-  if (include_tel) {
+  if (tel_java) {
     std::vector<std::string> tel_vector;
     AppendJavaStringArrayToStringVector(env, tel_java, &tel_vector);
-    tel = tel_vector;
+    tel = std::move(tel_vector);
   }
 
   base::Optional<std::vector<payments::mojom::PaymentAddressPtr>> addresses;
+  if (addresses_java) {
+    std::vector<payments::mojom::PaymentAddressPtr> addresses_vector;
+
+    for (const base::android::JavaRef<jbyteArray>& j_address :
+         addresses_java.ReadElements<jbyteArray>()) {
+      payments::mojom::PaymentAddressPtr address;
+      if (!payments::mojom::PaymentAddress::Deserialize(
+              static_cast<jbyte*>(env->GetDirectBufferAddress(j_address.obj())),
+              env->GetDirectBufferCapacity(j_address.obj()), &address)) {
+        continue;
+      }
+      addresses_vector.push_back(std::move(address));
+    }
+
+    addresses = std::move(addresses_vector);
+  }
 
   blink::mojom::ContactInfoPtr contact =
       blink::mojom::ContactInfo::New(std::move(names), std::move(emails),

content/browser/contacts/contacts_provider_android.h

@@ -32,13 +32,12 @@ class ContactsProviderAndroid : public ContactsProvider {
   // Adds one contact to the list of contacts selected. Note, EndContactsList
   // (or EndWithPermissionDenied) must be called to signal the end of the
   // construction of the contacts list.
-  void AddContact(JNIEnv* env,
-                  jboolean includeNames,
-                  jboolean includeEmails,
-                  jboolean includeTel,
-                  const base::android::JavaParamRef<jobjectArray>& names_java,
-                  const base::android::JavaParamRef<jobjectArray>& emails_java,
-                  const base::android::JavaParamRef<jobjectArray>& tel_java);
+  void AddContact(
+      JNIEnv* env,
+      const base::android::JavaParamRef<jobjectArray>& names_java,
+      const base::android::JavaParamRef<jobjectArray>& emails_java,
+      const base::android::JavaParamRef<jobjectArray>& tel_java,
+      const base::android::JavaParamRef<jobjectArray>& addresses_java);
 
   // Signals the end of adding contacts to the list. The contact list is
   // returned to the web page, the other params are logged via UKM.

content/public/android/java/src/org/chromium/content/browser/ContactsDialogHost.java

@@ -15,6 +15,7 @@ import org.chromium.ui.ContactsPickerListener;
 import org.chromium.ui.UiUtils;
 import org.chromium.ui.base.WindowAndroid;
 
+import java.nio.ByteBuffer;
 import java.util.List;
 
 /**
@@ -44,7 +45,7 @@ public class ContactsDialogHost implements ContactsPickerListener {
 
     @CalledByNative
     private void showDialog(boolean multiple, boolean includeNames, boolean includeEmails,
-            boolean includeTel, String formattedOrigin) {
+            boolean includeTel, boolean includeAddresses, String formattedOrigin) {
         if (mWindowAndroid.getActivity().get() == null) {
             ContactsDialogHostJni.get().endWithPermissionDenied(mNativeContactsProviderAndroid);
             return;
@@ -52,7 +53,8 @@ public class ContactsDialogHost implements ContactsPickerListener {
 
         if (mWindowAndroid.hasPermission(Manifest.permission.READ_CONTACTS)) {
             if (!UiUtils.showContactsPicker(mWindowAndroid.getActivity().get(), this, multiple,
-                        includeNames, includeEmails, includeTel, formattedOrigin)) {
+                        includeNames, includeEmails, includeTel, includeAddresses,
+                        formattedOrigin)) {
                 ContactsDialogHostJni.get().endWithPermissionDenied(mNativeContactsProviderAndroid);
             }
             return;
@@ -70,7 +72,7 @@ public class ContactsDialogHost implements ContactsPickerListener {
                             && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                         if (!UiUtils.showContactsPicker(mWindowAndroid.getActivity().get(), this,
                                     multiple, includeNames, includeEmails, includeTel,
-                                    formattedOrigin)) {
+                                    includeAddresses, formattedOrigin)) {
                             ContactsDialogHostJni.get().endWithPermissionDenied(
                                     mNativeContactsProviderAndroid);
                         }
@@ -95,7 +97,6 @@ public class ContactsDialogHost implements ContactsPickerListener {
             case ContactsPickerAction.CONTACTS_SELECTED:
                 for (Contact contact : contacts) {
                     ContactsDialogHostJni.get().addContact(mNativeContactsProviderAndroid,
-                            contact.names != null, contact.emails != null, contact.tel != null,
                             contact.names != null
                                     ? contact.names.toArray(new String[contact.names.size()])
                                     : null,
@@ -104,6 +105,10 @@ public class ContactsDialogHost implements ContactsPickerListener {
                                     : null,
                             contact.tel != null
                                     ? contact.tel.toArray(new String[contact.tel.size()])
+                                    : null,
+                            contact.serializedAddresses != null
+                                    ? contact.serializedAddresses.toArray(
+                                            new ByteBuffer[contact.serializedAddresses.size()])
                                     : null);
                 }
                 ContactsDialogHostJni.get().endContactsList(
@@ -118,9 +123,8 @@ public class ContactsDialogHost implements ContactsPickerListener {
 
     @NativeMethods
     interface Natives {
-        void addContact(long nativeContactsProviderAndroid, boolean includeNames,
-                boolean includeEmails, boolean includeTel, String[] names, String[] emails,
-                String[] tel);
+        void addContact(long nativeContactsProviderAndroid, String[] names, String[] emails,
+                String[] tel, ByteBuffer[] addresses);
         void endContactsList(
                 long nativeContactsProviderAndroid, int percentageShared, int propertiesRequested);
         void endWithPermissionDenied(long nativeContactsProviderAndroid);

content/public/browser/contacts_picker_properties_requested.h

@@ -17,7 +17,8 @@ enum ContactsPickerPropertiesRequested {
   PROPERTIES_TELS = 1 << 0,
   PROPERTIES_EMAILS = 1 << 1,
   PROPERTIES_NAMES = 1 << 2,
-  PROPERTIES_BOUNDARY = 1 << 3,
+  PROPERTIES_ADDRESSES = 1 << 3,
+  PROPERTIES_BOUNDARY = 1 << 4,
 };
 
 }  // namespace content

ui/android/BUILD.gn

@@ -218,6 +218,7 @@ android_library("ui_utils_java") {
   ]
   deps = [
     "//base:base_java",
+    "//components/payments/mojom:mojom_java",
     "//third_party/android_deps:android_support_v7_appcompat_java",
   ]
 }

ui/android/java/src/org/chromium/ui/ContactsPickerListener.java

@@ -6,8 +6,12 @@ package org.chromium.ui;
 
 import androidx.annotation.IntDef;
 
+import org.chromium.payments.mojom.PaymentAddress;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -15,18 +19,28 @@ import java.util.List;
  */
 public interface ContactsPickerListener {
     /**
-     * A container class for exhcanging contact details.
+     * A container class for exchanging contact details.
      */
-    public class Contact {
+    public static class Contact {
         public final List<String> names;
         public final List<String> emails;
         public final List<String> tel;
+        public final List<ByteBuffer> serializedAddresses;
 
-        public Contact(
-                List<String> contactNames, List<String> contactEmails, List<String> contactTel) {
+        public Contact(List<String> contactNames, List<String> contactEmails,
+                List<String> contactTel, List<PaymentAddress> contactAddresses) {
             names = contactNames;
             emails = contactEmails;
             tel = contactTel;
+
+            if (contactAddresses != null) {
+                serializedAddresses = new ArrayList<ByteBuffer>();
+                for (PaymentAddress address : contactAddresses) {
+                    serializedAddresses.add(address.serialize());
+                }
+            } else {
+                serializedAddresses = null;
+            }
         }
     }
 

ui/android/java/src/org/chromium/ui/UiUtils.java

@@ -98,12 +98,13 @@ public class UiUtils {
          * @param includeNames Whether to include names of the contacts shared.
          * @param includeEmails Whether to include emails of the contacts shared.
          * @param includeTel Whether to include telephone numbers of the contacts shared.
+         * @param includeAddresses Whether to include addresses of the contacts shared.
          * @param formattedOrigin The origin the data will be shared with, formatted for display
          *                        with the scheme omitted.
          */
         void showContactsPicker(Context context, ContactsPickerListener listener,
                 boolean allowMultiple, boolean includeNames, boolean includeEmails,
-                boolean includeTel, String formattedOrigin);
+                boolean includeTel, boolean includeAddresses, String formattedOrigin);
 
         /**
          * Called when the contacts picker dialog has been dismissed.
@@ -156,14 +157,15 @@ public class UiUtils {
      * @param includeNames Whether to include names in the contact data returned.
      * @param includeEmails Whether to include emails in the contact data returned.
      * @param includeTel Whether to include telephone numbers in the contact data returned.
+     * @param includeAddresses Whether to include addresses of the contacts shared.
      * @param formattedOrigin The origin the data will be shared with.
      */
     public static boolean showContactsPicker(Context context, ContactsPickerListener listener,
             boolean allowMultiple, boolean includeNames, boolean includeEmails, boolean includeTel,
-            String formattedOrigin) {
+            boolean includeAddresses, String formattedOrigin) {
         if (sContactsPickerDelegate == null) return false;
         sContactsPickerDelegate.showContactsPicker(context, listener, allowMultiple, includeNames,
-                includeEmails, includeTel, formattedOrigin);
+                includeEmails, includeTel, includeAddresses, formattedOrigin);
         return true;
     }