Add "Checking" spinner for server-side shipping address validation.

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 286 matching lines @@
         if (!parseAndValidateDetailsOrDisconnectFromClient(details)) return;
 
         // Empty shipping options means the merchant cannot ship to the user's selected shipping
         // address.
         if (mUiShippingOptions.isEmpty() && !mMerchantNeedsShippingAddress) {
             disconnectFromClientWithDebugMessage("Merchant indicates inability to ship although "
                     + "originally indicated that can ship anywhere");
             return;
         }
 
-        mUI.updateOrderSummarySection(mUiShoppingCart);
-        mUI.updateSection(PaymentRequestUI.TYPE_SHIPPING_OPTIONS, mUiShippingOptions);
+        if (mUiShippingOptions.isEmpty() && mShippingAddressesSection.getSelectedItem() != null) {
+            mShippingAddressesSection.getSelectedItem().setInvalid();
+            mShippingAddressesSection.setSelectedItemIndex(SectionInformation.INVALID_SELECTION);
+        }
+
+        if (mPaymentInformationCallback != null) {
+            providePaymentInformation();
+        } else {
+            mUI.updateOrderSummarySection(mUiShoppingCart);
+            mUI.updateSection(PaymentRequestUI.TYPE_SHIPPING_OPTIONS, mUiShippingOptions);
+        }
     }
 
     /**
      * Sets the total, display line items, and shipping options based on input and returns the
      * status boolean. That status is true for valid data, false for invalid data. If the input is
      * invalid, disconnects from the client. Both raw and UI versions of data are updated.
      *
      * @param details The total, line items, and shipping options to parse, validate, and save in
      *                member variables.
      * @return True if the data is valid. False if the data is invalid.
@@ skipping 143 matching lines @@
      */
     @Override
     public void getDefaultPaymentInformation(Callback<PaymentInformation> callback) {
         mPaymentInformationCallback = callback;
 
         if (mPaymentMethodsSection == null) return;
 
         mHandler.post(new Runnable() {
             @Override
             public void run() {
-                provideDefaultPaymentInformation();
+                providePaymentInformation();
             }
         });
     }
 
-    private void provideDefaultPaymentInformation() {
-        mPaymentInformationCallback.onResult(new PaymentInformation(
-                mUiShoppingCart.getTotal(), mShippingAddressesSection.getSelectedItem(),
-                mUiShippingOptions.getSelectedItem(), mPaymentMethodsSection.getSelectedItem()));
+    private void providePaymentInformation() {
+        mPaymentInformationCallback.onResult(new PaymentInformation(mUiShoppingCart,
+                mShippingAddressesSection, mUiShippingOptions, mPaymentMethodsSection));
         mPaymentInformationCallback = null;
     }
 
     @Override
     public void getShoppingCart(final Callback<ShoppingCart> callback) {
         mHandler.post(new Runnable() {
             @Override
             public void run() {
                 callback.onResult(mUiShoppingCart);
             }
@@ skipping 12 matching lines @@
                     callback.onResult(mUiShippingOptions);
                 } else if (optionType == PaymentRequestUI.TYPE_PAYMENT_METHODS) {
                     assert mPaymentMethodsSection != null;
                     callback.onResult(mPaymentMethodsSection);
                 }
             }
         });
     }
 
     @Override
-    public void onSectionOptionChanged(
-            @PaymentRequestUI.DataType int optionType, PaymentOption option) {
+    public boolean onSectionOptionChanged(@PaymentRequestUI.DataType int optionType,
+            PaymentOption option, Callback<PaymentInformation> callback) {
         if (optionType == PaymentRequestUI.TYPE_SHIPPING_ADDRESSES) {
-            // This may update the line items and/or the shipping options.
             assert option instanceof AutofillAddress;
             mShippingAddressesSection.setSelectedItem(option);
             if (mMerchantNeedsShippingAddress) {
+                mPaymentInformationCallback = callback;
+                // This updates the line items and the shipping options asynchronously.
                 mClient.onShippingAddressChange(((AutofillAddress) option).toPaymentAddress());
+                return true;
             }
         } else if (optionType == PaymentRequestUI.TYPE_SHIPPING_OPTIONS) {
             // This may update the line items.
             mUiShippingOptions.setSelectedItem(option);
             mClient.onShippingOptionChange(option.getIdentifier());
         } else if (optionType == PaymentRequestUI.TYPE_PAYMENT_METHODS) {
             assert option instanceof PaymentInstrument;
             mPaymentMethodsSection.setSelectedItem(option);
         }
+        return false;
     }
 
 
     @Override
     public void onSectionAddOption(@PaymentRequestUI.DataType int optionType) {
         // TODO(rouslan, dfalcantara): Make this code do something more useful.
         if (optionType == PaymentRequestUI.TYPE_SHIPPING_ADDRESSES) {
             PreferencesLauncher.launchSettingsPage(mContext, AutofillProfileEditor.class.getName());
         } else if (optionType == PaymentRequestUI.TYPE_PAYMENT_METHODS) {
             PreferencesLauncher.launchSettingsPage(
@@ skipping 72 matching lines @@
                     instrument.dismiss();
                 }
             }
         }
 
         if (mPendingApps.isEmpty()) {
             mPaymentMethodsSection = new SectionInformation(
                     PaymentRequestUI.TYPE_PAYMENT_METHODS, 0, mPendingInstruments);
             mPendingInstruments.clear();
 
-            if (mPaymentInformationCallback != null) provideDefaultPaymentInformation();
+            if (mPaymentInformationCallback != null) providePaymentInformation();
         }
     }
 
     /**
      * Called after retrieving instrument details.
      */
     @Override
     public void onInstrumentDetailsReady(String methodName, String stringifiedDetails) {
         PaymentResponse response = new PaymentResponse();
         response.methodName = methodName;
@@ skipping 54 matching lines @@
             }
             mPaymentMethodsSection = null;
         }
     }
 
     private void closeClient() {
         if (mClient != null) mClient.close();
         mClient = null;
     }
 }