Rename 'items' into 'displayItems' in PaymentDetails.

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.graphics.Bitmap;
 import android.os.Handler;
 import android.text.TextUtils;
@@ skipping 52 matching lines @@
     private final Handler mHandler = new Handler();
 
     private Activity mContext;
     private String mMerchantName;
     private String mOrigin;
     private Bitmap mFavicon;
     private List<PaymentApp> mApps;
     private PaymentRequestClient mClient;
     private Set<String> mSupportedMethods;
     private List<LineItem> mLineItems;
-    private List<PaymentItem> mPaymentItems;
+    private List<PaymentItem> mDisplayItems;
     private List<ShippingOption> mShippingOptions;
     private SectionInformation mShippingOptionsSection;
     private JSONObject mData;
     private SectionInformation mShippingAddressesSection;
     private List<PaymentApp> mPendingApps;
     private List<PaymentInstrument> mPendingInstruments;
     private SectionInformation mPaymentMethodsSection;
     private PaymentRequestUI mUI;
     private Callback<PaymentInformation> mPaymentInformationCallback;
     private Pattern mRegionCodePattern;
@@ skipping 115 matching lines @@
         boolean isGettingInstruments = false;
 
         for (int i = 0; i < mApps.size(); i++) {
             PaymentApp app = mApps.get(i);
             Set<String> appMethods = app.getSupportedMethodNames();
             appMethods.retainAll(mSupportedMethods);
             if (appMethods.isEmpty()) {
                 mPendingApps.remove(app);
             } else {
                 isGettingInstruments = true;
-                app.getInstruments(mPaymentItems, this);
+                app.getInstruments(mDisplayItems, this);
             }
         }
 
         if (!isGettingInstruments) {
             mPaymentMethodsSection = new SectionInformation(PaymentRequestUI.TYPE_PAYMENT_METHODS);
         }
 
         mUI = PaymentRequestUI.show(mContext, this, requestShipping, mMerchantName, mOrigin);
         if (mFavicon != null) mUI.setTitleBitmap(mFavicon);
         mFavicon = null;
@@ skipping 25 matching lines @@
         mUI.updateOrderSummarySection(mLineItems);
         mUI.updateSection(PaymentRequestUI.TYPE_SHIPPING_OPTIONS, mShippingOptionsSection);
     }
 
     private boolean setLineItemsAndShippingOptionsOrDisconnectFromClient(PaymentDetails details) {
         mLineItems = getValidatedLineItems(details);
         if (mLineItems == null) {
             disconnectFromClientWithDebugMessage("Invalid line items");
             return false;
         }
-        mPaymentItems = Arrays.asList(details.items);
+        mDisplayItems = Arrays.asList(details.displayItems);
 
         mShippingOptionsSection =
-                getValidatedShippingOptions(details.items[0].amount.currencyCode, details);
+                getValidatedShippingOptions(details.displayItems[0].amount.currencyCode, details);
         if (mShippingOptionsSection == null) {
             disconnectFromClientWithDebugMessage("Invalid shipping options");
             return false;
         }
         mShippingOptions = Arrays.asList(details.shippingOptions);
 
         return true;
     }
 
     private HashSet<String> getValidatedSupportedMethods(String[] methods) {
         // Payment methods are required.
         if (methods == null || methods.length == 0) return null;
 
         HashSet<String> result = new HashSet<>();
         for (int i = 0; i < methods.length; i++) {
             // Payment methods should be non-empty.
             if (TextUtils.isEmpty(methods[i])) return null;
             result.add(methods[i]);
         }
 
         return result;
     }
 
     private List<LineItem> getValidatedLineItems(PaymentDetails details) {
         // Line items are required.
-        if (details == null || details.items == null || details.items.length == 0) return null;
+        if (details == null || details.displayItems == null || details.displayItems.length == 0) {
+            return null;
+        }
 
-        for (int i = 0; i < details.items.length; i++) {
-            PaymentItem item = details.items[i];
+        for (int i = 0; i < details.displayItems.length; i++) {
+            PaymentItem item = details.displayItems[i];
             // "id", "label", "currencyCode", and "value" should be non-empty.
             if (item == null || TextUtils.isEmpty(item.label) || item.amount == null
                     || TextUtils.isEmpty(item.amount.currencyCode)
                     || TextUtils.isEmpty(item.amount.value)) {
                 return null;
             }
         }
 
         CurrencyStringFormatter formatter = new CurrencyStringFormatter(
-                details.items[0].amount.currencyCode, Locale.getDefault());
+                details.displayItems[0].amount.currencyCode, Locale.getDefault());
 
         // Currency codes should be in correct format.
-        if (!formatter.isValidAmountCurrencyCode(details.items[0].amount.currencyCode)) return null;
+        if (!formatter.isValidAmountCurrencyCode(details.displayItems[0].amount.currencyCode)) {
+            return null;
+        }
 
-        List<LineItem> result = new ArrayList<>(details.items.length);
-        for (int i = 0; i < details.items.length; i++) {
-            PaymentItem item = details.items[i];
+        List<LineItem> result = new ArrayList<>(details.displayItems.length);
+        for (int i = 0; i < details.displayItems.length; i++) {
+            PaymentItem item = details.displayItems[i];
 
             // All currency codes must match.
-            if (!item.amount.currencyCode.equals(details.items[0].amount.currencyCode)) return null;
+            if (!item.amount.currencyCode.equals(details.displayItems[0].amount.currencyCode)) {
+                return null;
+            }
 
             // Value should be in correct format.
             if (!formatter.isValidAmountValue(item.amount.value)) return null;
 
             result.add(new LineItem(item.label,
-                    i == details.items.length - 1 ? item.amount.currencyCode : "",
+                    i == details.displayItems.length - 1 ? item.amount.currencyCode : "",
                     formatter.format(item.amount.value)));
         }
 
         return result;
     }
 
     private SectionInformation getValidatedShippingOptions(
             String itemsCurrencyCode, PaymentDetails details) {
         // Shipping options are optional.
         if (details.shippingOptions == null || details.shippingOptions.length == 0) {
@@ skipping 153 matching lines @@
             PreferencesLauncher.launchSettingsPage(
                     mContext, AutofillCreditCardEditor.class.getName());
         }
     }
 
     @Override
     public void onPayClicked(PaymentOption selectedShippingAddress,
             PaymentOption selectedShippingOption, PaymentOption selectedPaymentMethod) {
         assert selectedPaymentMethod instanceof PaymentInstrument;
         PaymentInstrument instrument = (PaymentInstrument) selectedPaymentMethod;
-        instrument.getDetails(mMerchantName, mOrigin, mPaymentItems,
+        instrument.getDetails(mMerchantName, mOrigin, mDisplayItems,
                 mData.optJSONObject(instrument.getMethodName()), this);
     }
 
     @Override
     public void onDismiss() {
         disconnectFromClientWithDebugMessage("Dialog dismissed");
         closeUI(false);
     }
 
     /**
@@ skipping 122 matching lines @@
             }
             mPaymentMethodsSection = null;
         }
     }
 
     private void closeClient() {
         if (mClient != null) mClient.close();
         mClient = null;
     }
 }