enable modifiers for native apps

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 19 matching lines @@
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.payments.mojom.PaymentCurrencyAmount;
 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.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 import javax.annotation.Nullable;
 
 /**
  * The point of interaction with a locally installed 3rd party native Android payment app.
@@ skipping 22 matching lines @@
 
     // Freshest parameters sent to the payment app.
     private static final String EXTRA_CERTIFICATE = "certificate";
     private static final String EXTRA_MERCHANT_NAME = "merchantName";
     private static final String EXTRA_METHOD_DATA = "methodData";
     private static final String EXTRA_METHOD_NAMES = "methodNames";
     private static final String EXTRA_PAYMENT_REQUEST_ID = "paymentRequestId";
     private static final String EXTRA_PAYMENT_REQUEST_ORIGIN = "paymentRequestOrigin";
     private static final String EXTRA_TOP_LEVEL_CERTIFICATE_CHAIN = "topLevelCertificateChain";
     private static final String EXTRA_TOP_LEVEL_ORIGIN = "topLevelOrigin";
+    private static final String EXTRA_MODIFIERS = "modifiers";

[gogerald1, 2017/05/17 19:11:46]

You can move it under EXTRA_CERTIFICATE to list in alphabetic order.

[wuandy1, 2017/05/18 20:12:29]

Done.

     private static final String EXTRA_TOTAL = "total";
 
     // Response from the payment app.
     private static final String EXTRA_DEPRECATED_RESPONSE_INSTRUMENT_DETAILS = "instrumentDetails";
     private static final String EXTRA_RESPONSE_DETAILS = "details";
     private static final String EXTRA_RESPONSE_METHOD_NAME = "methodName";
 
     private static final String EMPTY_JSON_DATA = "{}";
 
     private final Handler mHandler;
@@ skipping 238 matching lines @@
             return;
         }
 
         mPayIntent.putExtras(buildExtras(id, 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 id, @Nullable String merchantName,
-            String origin, String iframeOrigin, @Nullable byte[][] certificateChain,
+    private Bundle buildExtras(@Nullable String id, @Nullable String merchantName, String origin,
+            String iframeOrigin, @Nullable byte[][] certificateChain,
             Map<String, PaymentMethodData> methodDataMap, PaymentItem total,
             @Nullable List<PaymentItem> displayItems,
             @Nullable Map<String, PaymentDetailsModifier> modifiers) {
         Bundle extras = new Bundle();
 
         if (id != null) extras.putString(EXTRA_PAYMENT_REQUEST_ID, id);
 
         if (merchantName != null) extras.putString(EXTRA_MERCHANT_NAME, merchantName);
 
         extras.putString(EXTRA_TOP_LEVEL_ORIGIN, origin);
@@ skipping 10 matching lines @@
         extras.putStringArrayList(EXTRA_METHOD_NAMES, new ArrayList<>(methodDataMap.keySet()));
 
         Bundle methodDataBundle = new Bundle();
         for (Map.Entry<String, PaymentMethodData> methodData : methodDataMap.entrySet()) {
             methodDataBundle.putString(methodData.getKey(),
                     methodData.getValue() == null ? EMPTY_JSON_DATA
                                                   : methodData.getValue().stringifiedData);
         }
         extras.putParcelable(EXTRA_METHOD_DATA, methodDataBundle);
 
+        if (modifiers != null) {
+            extras.putString(EXTRA_MODIFIERS, buildModifierListString(modifiers.values()));

[gogerald1, 2017/05/17 19:11:47]

Do not put 'null' value to EXTRA_MODIFIERS

[gogerald1, 2017/05/17 19:11:47]

You can name it "serializeModifiers" or "serializeModifiersCollection" to be
more specific

[wuandy1, 2017/05/18 20:12:29]

Done.

[wuandy1, 2017/05/18 20:12:29]

Done.

+        }
+
         String serializedTotalAmount = serializeTotalAmount(total.amount);
         extras.putString(EXTRA_TOTAL,
                 serializedTotalAmount == null ? EMPTY_JSON_DATA : serializedTotalAmount);
 
         return addDeprecatedExtras(id, origin, iframeOrigin, serializedCertificateChain,
                 methodDataMap, methodDataBundle, total, displayItems, extras);
     }
 
     private static Bundle addDeprecatedExtras(@Nullable String id, String origin,
             String iframeOrigin, @Nullable Parcelable[] serializedCertificateChain,
@@ skipping 101 matching lines @@
         json.name("amount").beginObject();
         json.name("currency").value(item.amount.currency);
         json.name("value").value(item.amount.value);
         json.endObject();
         // }}} amount
 
         json.endObject();
         // }}} item
     }
 
+    private String buildModifierListString(Collection<PaymentDetailsModifier> modifiers) {

[gogerald1, 2017/05/17 19:11:47]

annotate @Nullable

[wuandy1, 2017/05/18 20:12:28]

changed to return empty json instead.

[gogerald1, 2017/05/18 21:57:33]

even better,

+        StringWriter stringWriter = new StringWriter();
+        JsonWriter json = new JsonWriter(stringWriter);
+        try {
+            json.beginArray();
+            for (PaymentDetailsModifier modifier : modifiers) {
+                for (String supported : modifier.methodData.supportedMethods) {
+                    if (mMethodNames.contains(supported)) {

[gogerald1, 2017/05/17 19:11:47]

You no need to do this again here since we already filtered out unsupported
payment methods' modifiers here
https://cs.chromium.org/chromium/src/chrome/android/java/src/org/chromium/chr...

I think after removing this logic, you can make this method and the above
buildExtras static

[wuandy1, 2017/05/18 20:12:29]

Done.

+                        serializeModifier(modifier, json);
+                        break;
+                    }
+                }
+            }
+            json.endArray();
+        } catch (IOException e) {
+            return null;
+        }
+        return stringWriter.toString();
+    }
+
+    private static void serializeModifier(PaymentDetailsModifier modifier, JsonWriter json)
+            throws IOException {
+        // {{{
+        json.beginObject();
+
+        // total {{{
+        json.name("total");
+        serializePaymentItem(modifier.total, json);

[gogerald1, 2017/05/17 19:11:47]

total could be null in modifier

[wuandy1, 2017/05/18 20:12:29]

Done.

+        // }}} total
+
+        // supportedMethods {{{
+        json.name("supportedMethods").beginArray();
+        for (String method : modifier.methodData.supportedMethods) {
+            json.value(method);
+        }
+        json.endArray();
+        // }}} supportedMethods
+
+        json.endObject();
+        // }}}
+    }
+
     @Override
     public void onIntentCompleted(WindowAndroid window, int resultCode, Intent data) {
         ThreadUtils.assertOnUiThread();
         window.removeIntentCallback(this);
         if (data == null || data.getExtras() == null || resultCode != Activity.RESULT_OK) {
             mInstrumentDetailsCallback.onInstrumentDetailsError();
         } else {
             String details = data.getExtras().getString(EXTRA_RESPONSE_DETAILS);
             if (details == null) {
                 details = data.getExtras().getString(EXTRA_DEPRECATED_RESPONSE_INSTRUMENT_DETAILS);
             }
             if (details == null) {
                 details = EMPTY_JSON_DATA;
             }
             mInstrumentDetailsCallback.onInstrumentDetailsReady(
                     data.getExtras().getString(EXTRA_RESPONSE_METHOD_NAME), details);
         }
         mInstrumentDetailsCallback = null;
     }
 
     @Override
     public void dismissInstrument() {}
 }