Implement request id in PaymentDetailsInit

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.Context;
 import android.content.Intent;
 import android.graphics.Bitmap;
@@ skipping 277 matching lines @@
      * price string. This data is passed to the UI.
      */
     private ShoppingCart mUiShoppingCart;
 
     /**
      * The UI model for the shipping options. Includes the label and sublabel for each shipping
      * option. Also keeps track of the selected shipping option. This data is passed to the UI.
      */
     private SectionInformation mUiShippingOptions;
 
+    private String mId;

[please use gerrit instead, 2017/03/27 16:22:36]

Make this final and move it to the block of final variables. For example, line
263.

[rwlbuis, 2017/03/27 20:45:29]

I dont think I can make it final.

     private Map<String, PaymentMethodData> mMethodData;
     private boolean mRequestShipping;
     private boolean mRequestPayerName;
     private boolean mRequestPayerPhone;
     private boolean mRequestPayerEmail;
     private int mShippingType;
     private SectionInformation mShippingAddressesSection;
     private ContactDetailsSection mContactSection;
     private List<PaymentApp> mApps;
     private List<PaymentApp> mPendingApps;
@@ skipping 444 matching lines @@
             PaymentDetailsModifier modifier = details.modifiers[i];
             String[] methods = modifier.methodData.supportedMethods;
             for (int j = 0; j < methods.length; j++) {
                 if (mModifiers == null) mModifiers = new ArrayMap<>();
                 mModifiers.put(methods[j], modifier);
             }
         }
 
         updateInstrumentModifiedTotals();
 
+        if (details.id != null) {

[please use gerrit instead, 2017/03/27 16:22:36]

"id" can be set only in init(). It should not be set in updateWith(). Both of
those functions call into parseAndValidateDetailsOrDisconnectFromClient().
Therefore, this function is not the appropriate place for copying the "id".
Let's move the copying into init() instead.

If the response to https://github.com/w3c/browser-payment-api/issues/483 is
"generate `id` when it's empty or null," then init() should also check that
`details.id` is not null and not empty.

[rwlbuis, 2017/03/27 20:45:29]

Done.

+            mId = details.id;
+        }
+
         return true;
     }
 
     /** Updates the modifiers for payment instruments and order summary. */
     private void updateInstrumentModifiedTotals() {
         if (!ChromeFeatureList.isEnabled(ChromeFeatureList.WEB_PAYMENTS_MODIFIERS)) return;
         if (mModifiers == null) return;
         if (mPaymentMethodsSection == null) return;
 
         for (int i = 0; i < mPaymentMethodsSection.getSize(); i++) {
@@ skipping 388 matching lines @@
     @Override
     public boolean onPayClicked(PaymentOption selectedShippingAddress,
             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);
+                mId, selectedShippingAddress, selectedShippingOption, selectedContact, this);

[please use gerrit instead, 2017/03/27 16:22:36]

No need to pass `mId` back into the renderer. The renderer process already has
the identifier, which is unchangeable after construction.

[rwlbuis, 2017/03/27 20:45:29]

Done.

 
         // 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, mSchemelessOriginForPaymentApp,
+        instrument.invokePaymentApp(mId, mMerchantName, mSchemelessOriginForPaymentApp,
                 mSchemelessIFrameOriginForPaymentApp, mCertificateChain,
                 Collections.unmodifiableMap(methodData), mRawTotal, mRawLineItems,
                 Collections.unmodifiableMap(modifiers), this);
 
         recordSuccessFunnelHistograms("PayClicked");
         return !(instrument instanceof AutofillPaymentInstrument);
     }
 
     @Override
     public void onDismiss() {
@@ skipping 479 matching lines @@
 
     /**
      * The frecency score is calculated according to use count and last use date. The formula is
      * the same as the one used in GetFrecencyScore in autofill_data_model.cc.
      */
     private static final double getFrecencyScore(int count, long date) {
         long currentTime = System.currentTimeMillis();
         return -Math.log((currentTime - date) / (24 * 60 * 60 * 1000) + 2) / Math.log(count + 2);
     }
 }