PaymentApp: Implement invokePaymentApp for Android

chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentApp.java

 // Copyright 2017 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.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.RemoteException;
 import android.util.JsonWriter;
 
 import org.chromium.IsReadyToPayService;
 import org.chromium.IsReadyToPayServiceCallback;
 import org.chromium.chrome.R;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.WebContents;
+import org.chromium.payments.mojom.PaymentDetailsModifier;
 import org.chromium.payments.mojom.PaymentItem;
 import org.chromium.payments.mojom.PaymentMethodData;
 import org.chromium.ui.base.WindowAndroid;
 
 import java.io.IOException;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ skipping 160 matching lines @@
     public Set<String> getAppMethodNames() {
         return Collections.unmodifiableSet(mMethodNames);
     }
 
     @Override
     public Set<String> getInstrumentMethodNames() {
         return getAppMethodNames();
     }
 
     @Override
-    public void invokePaymentApp(String merchantName, String origin, PaymentItem total,
-            List<PaymentItem> cart, Map<String, PaymentMethodData> methodDataMap,
+    public void invokePaymentApp(String merchantName, String origin,
+            Map<String, PaymentMethodData> methodDataMap, PaymentItem total,
+            List<PaymentItem> displayItems, Map<String, PaymentDetailsModifier> modifiers,
             InstrumentDetailsCallback callback) {
         assert !mMethodNames.isEmpty();
         Bundle extras = new Bundle();
         extras.putString(EXTRA_ORIGIN, origin);
 
         String methodName = mMethodNames.iterator().next();
         extras.putString(EXTRA_METHOD_NAME, methodName);
 
         PaymentMethodData methodData = methodDataMap.get(methodName);
         extras.putString(
                 EXTRA_DATA, methodData == null ? EMPTY_JSON_DATA : methodData.stringifiedData);
 
-        String details = serializeDetails(total, cart);
+        String details = serializeDetails(total, displayItems);
         extras.putString(EXTRA_DETAILS, details == null ? EMPTY_JSON_DATA : details);
         mPayIntent.putExtras(extras);
 
         mInstrumentDetailsCallback = callback;
 
         ContentViewCore contentView = ContentViewCore.fromWebContents(mWebContents);
         if (contentView == null) {
             notifyError();
             return;
         }
@@ skipping 11 matching lines @@
 
     private void notifyError() {
         mHandler.post(new Runnable() {
             @Override
             public void run() {
                 mInstrumentDetailsCallback.onInstrumentDetailsError();
             }
         });
     }
 
-    private static String serializeDetails(PaymentItem total, List<PaymentItem> cart) {
+    private static String serializeDetails(PaymentItem total, List<PaymentItem> displayItems) {
         StringWriter stringWriter = new StringWriter();
         JsonWriter json = new JsonWriter(stringWriter);
         try {
             // details {{{
             json.beginObject();
 
             // total {{{
             json.name("total");
             serializePaymentItem(json, total);
             // }}} total
 
             // displayitems {{{
-            if (cart != null) {
+            if (displayItems != null) {
                 json.name("displayItems").beginArray();
-                for (int i = 0; i < cart.size(); i++) {
-                    serializePaymentItem(json, cart.get(i));
+                for (int i = 0; i < displayItems.size(); i++) {
+                    serializePaymentItem(json, displayItems.get(i));
                 }
                 json.endArray();
             }
             // }}} displayItems
 
             json.endObject();
             // }}} details
         } catch (IOException e) {
             return null;
         }
@@ skipping 26 matching lines @@
             mInstrumentDetailsCallback.onInstrumentDetailsReady(
                     data.getExtras().getString(EXTRA_METHOD_NAME),
                     data.getExtras().getString(EXTRA_INSTRUMENT_DETAILS));
         }
         mInstrumentDetailsCallback = null;
     }
 
     @Override
     public void dismissInstrument() {}
 }