PaymentRequest: Introduce PaymentDetailsInit and PaymentDetailsUpdate.

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 400 matching lines @@
         }
 
         mMethodData = getValidatedMethodData(methodData, mCardEditor);
         if (mMethodData == null) {
             disconnectFromClientWithDebugMessage("Invalid payment methods or data");
             recordAbortReasonHistogram(
                     PaymentRequestMetrics.ABORT_REASON_INVALID_DATA_FROM_RENDERER);
             return;
         }
 
         if (!parseAndValidateDetailsOrDisconnectFromClient(details)) return;

[please use gerrit instead, 2017/03/27 14:00:05]

Please add this block of code here:

if (mRawTotal == null) {
    disconnectFromClientWithDebugMessage("Missing total");
    recordAbortReasonHistogram(
            PaymentRequestMetrics.ABORT_REASON_INVALID_DATA_FROM_RENDERER);
    return;
}

A similar block of code should be added after line 48 in payment_request.cc:

if (!details->total) {
  LOG(ERROR) << "Missing total";
  OnConnectionTerminated();
  return;
}

https://cs.chromium.org/chromium/src/components/payments/content/payment_requ...

[zino, 2017/03/27 14:47:47]

Done.

 
         PaymentAppFactory.getInstance().create(mWebContents,
                 Collections.unmodifiableSet(mMethodData.keySet()), this /* callback */);
 
         mRequestShipping = options != null && options.requestShipping;
         mRequestPayerName = options != null && options.requestPayerName;
         mRequestPayerPhone = options != null && options.requestPayerPhone;
         mRequestPayerEmail = options != null && options.requestPayerEmail;
         mShippingType = options == null ? PaymentShippingType.SHIPPING : options.shippingType;
 
@@ skipping 296 matching lines @@
             recordAbortReasonHistogram(
                     PaymentRequestMetrics.ABORT_REASON_INVALID_DATA_FROM_RENDERER);
             return false;
         }
 
         if (mCurrencyFormatter == null) {
             mCurrencyFormatter = new CurrencyFormatter(details.total.amount.currency,
                     details.total.amount.currencySystem, Locale.getDefault());
         }
 
-        // Total is never pending.
-        LineItem uiTotal = new LineItem(details.total.label,
-                mCurrencyFormatter.getFormattedCurrencyCode(),
-                mCurrencyFormatter.format(details.total.amount.value), /* isPending */ false);
+        if (details.total != null) {
+            mRawTotal = details.total;
+        }
 
-        List<LineItem> uiLineItems = getLineItems(details.displayItems, mCurrencyFormatter);
+        if (mRawTotal != null) {

[please use gerrit instead, 2017/03/27 14:00:05]

Please remove the lines 740-742. That should make the code simpler without
changing the logic.

[zino, 2017/03/27 14:47:47]

Done.

[please use gerrit instead, 2017/03/27 14:59:39]

I'm so sorry. I think you original code was actually correctly handling the case
of updateWith() called without "total", but with "displayItems". My suggestion
was wrong. Please bring back the lines 740-742 :-(...

[zino, 2017/03/27 15:05:55]

Oh, right :) Thanks!

+            // Total is never pending.
+            LineItem uiTotal = new LineItem(mRawTotal.label,
+                    mCurrencyFormatter.getFormattedCurrencyCode(),
+                    mCurrencyFormatter.format(mRawTotal.amount.value), /* isPending */ false);
 
-        mUiShoppingCart = new ShoppingCart(uiTotal, uiLineItems);
-        mRawTotal = details.total;
+            List<LineItem> uiLineItems = getLineItems(details.displayItems, mCurrencyFormatter);
+
+            mUiShoppingCart = new ShoppingCart(uiTotal, uiLineItems);
+        }
         mRawLineItems = Collections.unmodifiableList(Arrays.asList(details.displayItems));
 
         mUiShippingOptions = getShippingOptions(details.shippingOptions, mCurrencyFormatter);
 
         for (int i = 0; i < details.modifiers.length; i++) {
             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);
@@ skipping 921 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);
     }
 }