[Payments] Show complete profiles first and limit to 4 suggestions.

chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentRequestImpl.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.Activity;
 import android.graphics.Bitmap;
 import android.os.Handler;
 import android.text.TextUtils;
@@ skipping 27 matching lines @@
 import org.chromium.mojom.payments.PaymentRequestClient;
 import org.chromium.mojom.payments.PaymentResponse;
 import org.chromium.mojom.payments.PaymentShippingOption;
 import org.chromium.ui.base.WindowAndroid;
 import org.json.JSONException;
 import org.json.JSONObject;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
 import java.util.Set;
 
 /**
  * Android implementation of the PaymentRequest service defined in
  * third_party/WebKit/public/platform/modules/payments/payment_request.mojom.
  */
@@ skipping 10 matching lines @@
         void onPaymentRequestServiceUnableToAbort();
     }
 
     /**
      * The size for the favicon in density-independent pixels.
      */
     private static final int FAVICON_SIZE_DP = 24;
 
     private static final String TAG = "cr_PaymentRequest";
 
+    private static final int SUGGESTIONS_LIMIT = 4;
+
     private static PaymentRequestServiceObserverForTest sObserverForTest;
 
     private final Handler mHandler = new Handler();
 
     private Activity mContext;
     private String mMerchantName;
     private String mOrigin;
     private Bitmap mFavicon;
     private List<PaymentApp> mApps;
     private PaymentRequestClient mClient;
@@ skipping 113 matching lines @@
         }
 
         mMethodData = getValidatedMethodData(methodData);
         if (mMethodData == null) {
             disconnectFromClientWithDebugMessage("Invalid payment methods or data");
             return;
         }
 
         if (!parseAndValidateDetailsOrDisconnectFromClient(details)) return;
 
+        // Create a comparator to sort the suggestions by completeness.
+        Comparator<Completable> completenessComparator = new Comparator<Completable>() {
+            @Override
+            public int compare(Completable a, Completable b) {
+                if (a.isComplete() == b.isComplete()) {
+                    return 0;
+                } else if (a.isComplete()) {
+                    return -1;
+                } else {
+                    return 1;
+                }
+            }
+        };
+
         // If the merchant requests shipping and does not provide a selected shipping option, then
         // the merchant needs the shipping address to calculate the shipping price and availability.
         boolean requestShipping = options != null && options.requestShipping;
         mMerchantNeedsShippingAddress =
                 requestShipping && mUiShippingOptions.getSelectedItem() == null;
 
         boolean requestPayerPhone = options != null && options.requestPayerPhone;
         boolean requestPayerEmail = options != null && options.requestPayerEmail;
 
         List<AutofillProfile> profiles = null;
         if (requestShipping || requestPayerPhone || requestPayerEmail) {
             profiles = PersonalDataManager.getInstance().getProfilesToSuggest();
         }
 
         if (requestShipping) {
             mAddressEditor = new AddressEditor();
             List<AutofillAddress> addresses = new ArrayList<>();
-            int firstCompleteAddressIndex = SectionInformation.NO_SELECTION;
 
             for (int i = 0; i < profiles.size(); i++) {
                 AutofillProfile profile = profiles.get(i);
                 mAddressEditor.addPhoneNumberIfValid(profile.getPhoneNumber());
 
                 boolean isComplete = mAddressEditor.isProfileComplete(profile);
                 addresses.add(new AutofillAddress(profile, isComplete));
-                if (isComplete && firstCompleteAddressIndex == SectionInformation.NO_SELECTION
-                        && !mMerchantNeedsShippingAddress) {
-                    firstCompleteAddressIndex = i;
-                }
             }
 
-            // The shipping address section automatically selects the first complete entry.
+            // Suggest complete addresses first.
+            Collections.sort(addresses, completenessComparator);
+
+            // Limit the number of suggestions.
+            addresses = addresses.subList(0, Math.min(addresses.size(), SUGGESTIONS_LIMIT));
+
+            // Automatically select the first address if one is complete and if the merchant does
+            // not require a shipping address to calculate shipping costs.
+            int firstCompleteAddressIndex = SectionInformation.NO_SELECTION;
+            if (!mMerchantNeedsShippingAddress && !addresses.isEmpty()
+                        && addresses.get(0).isComplete()) {

[please use gerrit instead, 2016/07/08 08:36:31]

Should be +8. not +12 indent.

[sebsg, 2016/07/08 09:20:25]

Done.

+                firstCompleteAddressIndex = 0;
+            }
+
             mShippingAddressesSection =
                     new SectionInformation(PaymentRequestUI.TYPE_SHIPPING_ADDRESSES,
                             firstCompleteAddressIndex, addresses);
         }
 
         if (requestPayerPhone || requestPayerEmail) {
             Set<String> uniqueContactInfos = new HashSet<>();
             mContactEditor = new ContactEditor(requestPayerPhone, requestPayerEmail);
             List<AutofillContact> contacts = new ArrayList<>();
-            int firstCompleteContactIndex = SectionInformation.NO_SELECTION;
 
             for (int i = 0; i < profiles.size(); i++) {
                 AutofillProfile profile = profiles.get(i);
                 String phone = requestPayerPhone && !TextUtils.isEmpty(profile.getPhoneNumber())
                         ? profile.getPhoneNumber() : null;
                 String email = requestPayerEmail && !TextUtils.isEmpty(profile.getEmailAddress())
                         ? profile.getEmailAddress() : null;
                 mContactEditor.addPhoneNumberIfValid(phone);
                 mContactEditor.addEmailAddressIfValid(email);
 
                 if (phone != null || email != null) {
                     // Different profiles can have identical contact info. Do not add the same
                     // contact info to the list twice.
                     String uniqueContactInfo = phone + email;
                     if (!uniqueContactInfos.contains(uniqueContactInfo)) {
                         uniqueContactInfos.add(uniqueContactInfo);
 
                         boolean isComplete =
                                 mContactEditor.isContactInformationComplete(phone, email);
                         contacts.add(new AutofillContact(profile, phone, email, isComplete));
-                        if (isComplete
-                                && firstCompleteContactIndex == SectionInformation.NO_SELECTION) {
-                            firstCompleteContactIndex = i;
-                        }
                     }
                 }
             }
 
-            // The contact section automatically selects the first complete entry.
+            // Suggest complete contact infos first.
+            Collections.sort(contacts, completenessComparator);
+
+            // Limit the number of suggestions.
+            contacts = contacts.subList(0, Math.min(contacts.size(), SUGGESTIONS_LIMIT));
+
+            // Automatically select the first address if it is complete.
+            int firstCompleteContactIndex = SectionInformation.NO_SELECTION;
+            if (!contacts.isEmpty() && contacts.get(0).isComplete()) {
+                firstCompleteContactIndex = 0;
+            }
+
             mContactSection = new SectionInformation(
                     PaymentRequestUI.TYPE_CONTACT_DETAILS, firstCompleteContactIndex, contacts);
         }
 
         mPendingApps = new ArrayList<>(mApps);
         mPendingInstruments = new ArrayList<>();
         boolean isGettingInstruments = false;
 
         for (int i = 0; i < mApps.size(); i++) {
             PaymentApp app = mApps.get(i);
@@ skipping 570 matching lines @@
     private void closeClient() {
         if (mClient != null) mClient.close();
         mClient = null;
     }
 
     @VisibleForTesting
     public static void setObserverForTest(PaymentRequestServiceObserverForTest observerForTest) {
         sObserverForTest = observerForTest;
     }
 }