PaymentApp: Implement invokePaymentApp for Android

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.content.Intent;
 import android.graphics.Bitmap;
 import android.os.Handler;
@@ skipping 653 matching lines @@
                 new LineItem(total.label, mCurrencyFormatter.getFormattedCurrencyCode(),
                         mCurrencyFormatter.format(total.amount.value), false /* isPending */));
         mUiShoppingCart.setAdditionalContents(modifier == null
                         ? null
                         : getLineItems(modifier.additionalDisplayItems, mCurrencyFormatter));
         mUI.updateOrderSummarySection(mUiShoppingCart);
     }
 
     /** @return The first modifier that matches the given instrument, or null. */
     @Nullable private PaymentDetailsModifier getModifier(@Nullable PaymentInstrument instrument) {
-        if (instrument == null) return null;
+        if (mModifiers == null || instrument == null) return null;
         Set<String> methodNames = instrument.getInstrumentMethodNames();
         methodNames.retainAll(mModifiers.keySet());
         return methodNames.isEmpty() ? null : mModifiers.get(methodNames.iterator().next());
     }
 
     /**
      * Converts a list of payment items and returns their parsed representation.
      *
      * @param items     The payment items to parse. Can be null.
      * @param formatter A formatter for the currency amount value.
@@ skipping 342 matching lines @@
             PaymentOption selectedShippingOption, PaymentOption selectedPaymentMethod) {
         assert selectedPaymentMethod instanceof PaymentInstrument;
         PaymentInstrument instrument = (PaymentInstrument) selectedPaymentMethod;
         mPaymentAppRunning = true;
 
         PaymentOption selectedContact = mContactSection != null ? mContactSection.getSelectedItem()
                 : null;
         mPaymentResponseHelper = new PaymentResponseHelper(
                 selectedShippingAddress, selectedShippingOption, selectedContact, this);
 
-        // Create a map that is the subset of mMethodData that contains the
-        // payment methods supported by the selected payment instrument. If this
-        // intersection contains more than one payment method, the payment app is
-        // at liberty to choose (or have the user choose) one of the methods.
+        // Create maps that are subsets of mMethodData and mModifiers, that contain
+        // the payment methods supported by the selected payment instrument. If the
+        // intersection of method data contains more than one payment method, the
+        // payment app is at liberty to choose (or have the user choose) one of the
+        // methods.
         Map<String, PaymentMethodData> methodData = new HashMap<>();
+        Map<String, PaymentDetailsModifier> modifiers = new HashMap<>();
         for (String instrumentMethodName : instrument.getInstrumentMethodNames()) {
             if (mMethodData.containsKey(instrumentMethodName)) {
                 methodData.put(instrumentMethodName, mMethodData.get(instrumentMethodName));
             }
+            if (mModifiers != null && mModifiers.containsKey(instrumentMethodName)) {
+                modifiers.put(instrumentMethodName, mModifiers.get(instrumentMethodName));
+            }
         }
 
-        instrument.invokePaymentApp(mMerchantName, mOrigin, mRawTotal, mRawLineItems,
-                Collections.unmodifiableMap(methodData), this);
+        instrument.invokePaymentApp(mMerchantName, mOrigin, Collections.unmodifiableMap(methodData),
+                mRawTotal, mRawLineItems, Collections.unmodifiableMap(modifiers), this);
+
         recordSuccessFunnelHistograms("PayClicked");
         return !(instrument instanceof AutofillPaymentInstrument);
     }
 
     @Override
     public void onDismiss() {
         disconnectFromClientWithDebugMessage("Dialog dismissed");
         recordAbortReasonHistogram(PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER);
     }
 
@@ skipping 407 matching lines @@
                 "PaymentRequest.CheckoutFunnel.Aborted", abortReason,
                 PaymentRequestMetrics.ABORT_REASON_MAX);
 
         if (abortReason == PaymentRequestMetrics.ABORT_REASON_ABORTED_BY_USER) {
             mJourneyLogger.recordJourneyStatsHistograms("UserAborted");
         } else {
             mJourneyLogger.recordJourneyStatsHistograms("OtherAborted");
         }
     }
 }