OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/android/payments/service_worker_payment_app_bridge.h" | 5 #include "chrome/browser/android/payments/service_worker_payment_app_bridge.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/android/jni_array.h" | 9 #include "base/android/jni_array.h" |
10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 content::WebContents* web_contents = | 78 content::WebContents* web_contents = |
79 content::WebContents::FromJavaWebContents(jweb_contents); | 79 content::WebContents::FromJavaWebContents(jweb_contents); |
80 | 80 |
81 content::PaymentAppProvider::GetInstance()->GetAllPaymentApps( | 81 content::PaymentAppProvider::GetInstance()->GetAllPaymentApps( |
82 web_contents->GetBrowserContext(), | 82 web_contents->GetBrowserContext(), |
83 base::Bind(&OnGotAllPaymentApps, | 83 base::Bind(&OnGotAllPaymentApps, |
84 ScopedJavaGlobalRef<jobject>(env, jweb_contents), | 84 ScopedJavaGlobalRef<jobject>(env, jweb_contents), |
85 ScopedJavaGlobalRef<jobject>(env, jcallback))); | 85 ScopedJavaGlobalRef<jobject>(env, jcallback))); |
86 } | 86 } |
87 | 87 |
88 static void InvokePaymentApp(JNIEnv* env, | 88 static void InvokePaymentApp( |
89 const JavaParamRef<jclass>& jcaller, | 89 JNIEnv* env, |
90 const JavaParamRef<jobject>& jweb_contents, | 90 const JavaParamRef<jclass>& jcaller, |
91 jlong registration_id, | 91 const JavaParamRef<jobject>& jweb_contents, |
92 const JavaParamRef<jstring>& joption_id, | 92 jlong registration_id, |
93 const JavaParamRef<jstring>& jorigin, | 93 const JavaParamRef<jstring>& jtop_level_origin, |
94 const JavaParamRef<jobjectArray>& jmethod_data, | 94 const JavaParamRef<jstring>& jpayment_request_origin, |
95 const JavaParamRef<jobject>& jtotal, | 95 const JavaParamRef<jstring>& jpayment_request_id, |
96 const JavaParamRef<jobjectArray>& jmodifiers, | 96 const JavaParamRef<jobjectArray>& jmethod_data, |
97 const JavaParamRef<jobject>& jcallback) { | 97 const JavaParamRef<jobject>& jtotal, |
| 98 const JavaParamRef<jobjectArray>& jmodifiers, |
| 99 const JavaParamRef<jstring>& jinstrument_key, |
| 100 const JavaParamRef<jobject>& jcallback) { |
98 content::WebContents* web_contents = | 101 content::WebContents* web_contents = |
99 content::WebContents::FromJavaWebContents(jweb_contents); | 102 content::WebContents::FromJavaWebContents(jweb_contents); |
100 | 103 |
101 PaymentAppRequestPtr app_request = PaymentAppRequest::New(); | 104 PaymentAppRequestPtr app_request = PaymentAppRequest::New(); |
102 | 105 |
103 app_request->option_id = ConvertJavaStringToUTF8(env, joption_id); | 106 app_request->top_level_origin = |
104 app_request->origin = GURL(ConvertJavaStringToUTF8(env, jorigin)); | 107 GURL(ConvertJavaStringToUTF8(env, jtop_level_origin)); |
| 108 app_request->payment_request_origin = |
| 109 GURL(ConvertJavaStringToUTF8(env, jpayment_request_origin)); |
| 110 app_request->payment_request_id = |
| 111 ConvertJavaStringToUTF8(env, jpayment_request_id); |
105 | 112 |
106 for (jsize i = 0; i < env->GetArrayLength(jmethod_data); i++) { | 113 for (jsize i = 0; i < env->GetArrayLength(jmethod_data); i++) { |
107 ScopedJavaLocalRef<jobject> element( | 114 ScopedJavaLocalRef<jobject> element( |
108 env, env->GetObjectArrayElement(jmethod_data, i)); | 115 env, env->GetObjectArrayElement(jmethod_data, i)); |
109 PaymentMethodDataPtr methodData = PaymentMethodData::New(); | 116 PaymentMethodDataPtr methodData = PaymentMethodData::New(); |
110 base::android::AppendJavaStringArrayToStringVector( | 117 base::android::AppendJavaStringArrayToStringVector( |
111 env, | 118 env, |
112 Java_ServiceWorkerPaymentAppBridge_getSupportedMethodsFromMethodData( | 119 Java_ServiceWorkerPaymentAppBridge_getSupportedMethodsFromMethodData( |
113 env, element) | 120 env, element) |
114 .obj(), | 121 .obj(), |
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
162 .obj(), | 169 .obj(), |
163 &modifier->method_data->supported_methods); | 170 &modifier->method_data->supported_methods); |
164 modifier->method_data->stringified_data = ConvertJavaStringToUTF8( | 171 modifier->method_data->stringified_data = ConvertJavaStringToUTF8( |
165 env, | 172 env, |
166 Java_ServiceWorkerPaymentAppBridge_getStringifiedDataFromMethodData( | 173 Java_ServiceWorkerPaymentAppBridge_getStringifiedDataFromMethodData( |
167 env, jmodifier_method_data)); | 174 env, jmodifier_method_data)); |
168 | 175 |
169 app_request->modifiers.push_back(std::move(modifier)); | 176 app_request->modifiers.push_back(std::move(modifier)); |
170 } | 177 } |
171 | 178 |
| 179 app_request->instrument_key = ConvertJavaStringToUTF8(env, jinstrument_key); |
| 180 |
172 content::PaymentAppProvider::GetInstance()->InvokePaymentApp( | 181 content::PaymentAppProvider::GetInstance()->InvokePaymentApp( |
173 web_contents->GetBrowserContext(), registration_id, | 182 web_contents->GetBrowserContext(), registration_id, |
174 std::move(app_request), | 183 std::move(app_request), |
175 base::Bind(&OnPaymentAppInvoked, | 184 base::Bind(&OnPaymentAppInvoked, |
176 ScopedJavaGlobalRef<jobject>(env, jweb_contents), | 185 ScopedJavaGlobalRef<jobject>(env, jweb_contents), |
177 ScopedJavaGlobalRef<jobject>(env, jcallback))); | 186 ScopedJavaGlobalRef<jobject>(env, jcallback))); |
178 } | 187 } |
179 | 188 |
180 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) { | 189 bool RegisterServiceWorkerPaymentAppBridge(JNIEnv* env) { |
181 return RegisterNativesImpl(env); | 190 return RegisterNativesImpl(env); |
182 } | 191 } |
OLD | NEW |