Implement request id in PaymentDetailsInit

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.DialogInterface;
@@ skipping 38 matching lines @@
         extends PaymentInstrument implements PaymentApp, WindowAndroid.IntentCallback {
     /** The action name for the Pay Intent. */
     public static final String ACTION_PAY = "org.chromium.intent.action.PAY";
 
     /** The maximum number of milliseconds to wait for a response from a READY_TO_PAY service. */
     private static final long READY_TO_PAY_TIMEOUT_MS = 400;
 
     /** The maximum number of milliseconds to wait for a connection to READY_TO_PAY service. */
     private static final long SERVICE_CONNECTION_TIMEOUT_MS = 1000;
 
+    private static final String EXTRA_REQUEST_ID = "requestId";

[please use gerrit instead, 2017/03/24 20:14:18]

Why "requestId" instead of id"? What does the payment handler spec do?

     private static final String EXTRA_MERCHANT_NAME = "merchantName";
     private static final String EXTRA_METHOD_NAME = "methodName";
     private static final String EXTRA_METHOD_NAMES = "methodNames";
     private static final String EXTRA_DATA = "data";
     private static final String EXTRA_ORIGIN = "origin";
     private static final String EXTRA_IFRAME_ORIGIN = "iframeOrigin";
     private static final String EXTRA_DATA_MAP = "dataMap";
     private static final String EXTRA_DETAILS = "details";
     private static final String EXTRA_INSTRUMENT_DETAILS = "instrumentDetails";
     private static final String EXTRA_CERTIFICATE_CHAIN = "certificateChain";
@@ skipping 70 matching lines @@
                     respondToGetInstrumentsQuery(null);
                 } else {
                     sendIsReadyToPayIntentToPaymentApp(isReadyToPayService);
                 }
             }
 
             @Override
             public void onServiceDisconnected(ComponentName name) {}
         };
 
-        mIsReadyToPayIntent.putExtras(buildExtras(
-                null, origin, iframeOrigin, certificateChain, methodDataMap, null, null, null));
+        mIsReadyToPayIntent.putExtras(buildExtras(null, null, origin, iframeOrigin,
+                certificateChain, methodDataMap, null, null, null));
         try {
             if (!ContextUtils.getApplicationContext().bindService(
                         mIsReadyToPayIntent, mServiceConnection, Context.BIND_AUTO_CREATE)) {
                 respondToGetInstrumentsQuery(null);
                 return;
             }
         } catch (SecurityException e) {
             respondToGetInstrumentsQuery(null);
             return;
         }
@@ skipping 75 matching lines @@
     public Set<String> getAppMethodNames() {
         return Collections.unmodifiableSet(mMethodNames);
     }
 
     @Override
     public Set<String> getInstrumentMethodNames() {
         return getAppMethodNames();
     }
 
     @Override
-    public void invokePaymentApp(final String merchantName, final String origin,
-            final String iframeOrigin, final byte[][] certificateChain,
+    public void invokePaymentApp(final String requestId, final String merchantName,
+            final String origin, final String iframeOrigin, final byte[][] certificateChain,
             final Map<String, PaymentMethodData> methodDataMap, final PaymentItem total,
             final List<PaymentItem> displayItems,
             final Map<String, PaymentDetailsModifier> modifiers,
             InstrumentDetailsCallback callback) {
         mInstrumentDetailsCallback = callback;
 
         if (!mIsIncognito) {
-            launchPaymentApp(merchantName, origin, iframeOrigin, certificateChain, methodDataMap,
-                    total, displayItems, modifiers);
+            launchPaymentApp(requestId, merchantName, origin, iframeOrigin, certificateChain,
+                    methodDataMap, total, displayItems, modifiers);
             return;
         }
 
         ChromeActivity activity = ChromeActivity.fromWebContents(mWebContents);
         if (activity == null) {
             notifyErrorInvokingPaymentApp();
             return;
         }
 
         new AlertDialog.Builder(activity, R.style.AlertDialogTheme)
                 .setTitle(R.string.external_app_leave_incognito_warning_title)
                 .setMessage(R.string.external_payment_app_leave_incognito_warning)
                 .setPositiveButton(R.string.ok,
                         new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
-                                launchPaymentApp(merchantName, origin, iframeOrigin,
+                                launchPaymentApp(requestId, merchantName, origin, iframeOrigin,
                                         certificateChain, methodDataMap, total, displayItems,
                                         modifiers);
                             }
                         })
                 .setNegativeButton(R.string.cancel,
                         new OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialog, int which) {
                                 notifyErrorInvokingPaymentApp();
                             }
                         })
                 .setOnCancelListener(new OnCancelListener() {
                     @Override
                     public void onCancel(DialogInterface dialog) {
                         notifyErrorInvokingPaymentApp();
                     }
                 })
                 .show();
     }
 
-    private void launchPaymentApp(String merchantName, String origin, String iframeOrigin,
-            byte[][] certificateChain, Map<String, PaymentMethodData> methodDataMap,
-            PaymentItem total, List<PaymentItem> displayItems,
-            Map<String, PaymentDetailsModifier> modifiers) {
+    private void launchPaymentApp(String requestId, String merchantName, String origin,
+            String iframeOrigin, byte[][] certificateChain,
+            Map<String, PaymentMethodData> methodDataMap, PaymentItem total,
+            List<PaymentItem> displayItems, Map<String, PaymentDetailsModifier> modifiers) {
         assert mMethodNames.containsAll(methodDataMap.keySet());
         assert mInstrumentDetailsCallback != null;
 
         WindowAndroid window = mWebContents.getTopLevelNativeWindow();
         if (window == null) {
             notifyErrorInvokingPaymentApp();
             return;
         }
 
-        mPayIntent.putExtras(buildExtras(merchantName, origin, iframeOrigin, certificateChain,
-                methodDataMap, total, displayItems, modifiers));
+        mPayIntent.putExtras(buildExtras(requestId, merchantName, origin, iframeOrigin,
+                certificateChain, methodDataMap, total, displayItems, modifiers));
         if (!window.showIntent(mPayIntent, this, R.string.payments_android_app_error)) {
             notifyErrorInvokingPaymentApp();
         }
     }
 
-    private static Bundle buildExtras(@Nullable String merchantName, String origin,
-            String iframeOrigin, @Nullable byte[][] certificateChain,
+    private static Bundle buildExtras(@Nullable String requestId, @Nullable String merchantName,
+            String origin, String iframeOrigin, @Nullable byte[][] certificateChain,
             Map<String, PaymentMethodData> methodDataMap, @Nullable PaymentItem total,
             @Nullable List<PaymentItem> displayItems,
             @Nullable Map<String, PaymentDetailsModifier> modifiers) {
         Bundle extras = new Bundle();
 
+        if (requestId != null) extras.putString(EXTRA_REQUEST_ID, requestId);
         if (merchantName != null) extras.putString(EXTRA_MERCHANT_NAME, merchantName);
         extras.putString(EXTRA_ORIGIN, origin);
         extras.putString(EXTRA_IFRAME_ORIGIN, iframeOrigin);
 
         if (certificateChain != null && certificateChain.length > 0) {
             extras.putParcelableArray(
                     EXTRA_CERTIFICATE_CHAIN, buildCertificateChain(certificateChain));
         }
 
         // Deprecated:
@@ skipping 97 matching lines @@
             mInstrumentDetailsCallback.onInstrumentDetailsReady(
                     data.getExtras().getString(EXTRA_METHOD_NAME),
                     data.getExtras().getString(EXTRA_INSTRUMENT_DETAILS));
         }
         mInstrumentDetailsCallback = null;
     }
 
     @Override
     public void dismissInstrument() {}
 }