Commit 1ff09008 authored by Liquan (Max) Gu's avatar Liquan (Max) Gu Committed by Commit Bot

[PlayBilling] Move AndroidPaymentApp#invokePaymentApp into helpers

Before Change:
buildExtra and its dependencies live in AndroidPaymentApp.

After Change:
buildExtra and its dependencies live in WebPaymentIntentHelper.

Change:
1. create WebPaymentIntentHelper
2. move AndroidPaymentApp#buildExtra() and its dependencies into
WebPaymentIntentHelper.

Bug: 1057488

Change-Id: I79e873d28a7bcbe119ac2966590d2892ecf76f40
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2082479
Commit-Queue: Liquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: default avatarLiquan (Max) Gu <maxlg@chromium.org>
Reviewed-by: default avatarRouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#746510}
parent 464e400d
...@@ -1265,6 +1265,7 @@ chrome_java_sources = [ ...@@ -1265,6 +1265,7 @@ chrome_java_sources = [
"java/src/org/chromium/chrome/browser/payments/SslValidityChecker.java", "java/src/org/chromium/chrome/browser/payments/SslValidityChecker.java",
"java/src/org/chromium/chrome/browser/payments/SupportedDelegations.java", "java/src/org/chromium/chrome/browser/payments/SupportedDelegations.java",
"java/src/org/chromium/chrome/browser/payments/UriUtils.java", "java/src/org/chromium/chrome/browser/payments/UriUtils.java",
"java/src/org/chromium/chrome/browser/payments/WebPaymentIntentHelper.java",
"java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java", "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerCoordinator.java",
"java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java", "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerMediator.java",
"java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerProperties.java", "java/src/org/chromium/chrome/browser/payments/handler/PaymentHandlerProperties.java",
......
...@@ -38,7 +38,7 @@ public class AndroidPaymentAppFactory implements PaymentAppFactoryInterface { ...@@ -38,7 +38,7 @@ public class AndroidPaymentAppFactory implements PaymentAppFactoryInterface {
PackageManagerDelegate packageManagerDelegate = new PackageManagerDelegate(); PackageManagerDelegate packageManagerDelegate = new PackageManagerDelegate();
// Note that all Android payment apps must support org.chromium.intent.action.PAY action // Note that all Android payment apps must support org.chromium.intent.action.PAY action
// without additional data to be detected. // without additional data to be detected.
Intent payIntent = new Intent(AndroidPaymentApp.ACTION_PAY); Intent payIntent = new Intent(WebPaymentIntentHelper.ACTION_PAY);
return !packageManagerDelegate.getActivitiesThatCanRespondToIntent(payIntent).isEmpty(); return !packageManagerDelegate.getActivitiesThatCanRespondToIntent(payIntent).isEmpty();
} }
...@@ -52,7 +52,7 @@ public class AndroidPaymentAppFactory implements PaymentAppFactoryInterface { ...@@ -52,7 +52,7 @@ public class AndroidPaymentAppFactory implements PaymentAppFactoryInterface {
Map<String, Pair<String, Drawable>> paymentAppsInfo = new HashMap<>(); Map<String, Pair<String, Drawable>> paymentAppsInfo = new HashMap<>();
PackageManagerDelegate packageManagerDelegate = new PackageManagerDelegate(); PackageManagerDelegate packageManagerDelegate = new PackageManagerDelegate();
Intent payIntent = new Intent(AndroidPaymentApp.ACTION_PAY); Intent payIntent = new Intent(WebPaymentIntentHelper.ACTION_PAY);
List<ResolveInfo> matches = List<ResolveInfo> matches =
packageManagerDelegate.getActivitiesThatCanRespondToIntent(payIntent); packageManagerDelegate.getActivitiesThatCanRespondToIntent(payIntent);
if (matches.isEmpty()) return paymentAppsInfo; if (matches.isEmpty()) return paymentAppsInfo;
......
...@@ -189,7 +189,7 @@ public class AndroidPaymentAppFinder implements ManifestVerifyCallback { ...@@ -189,7 +189,7 @@ public class AndroidPaymentAppFinder implements ManifestVerifyCallback {
/* package */ void findAndroidPaymentApps() { /* package */ void findAndroidPaymentApps() {
List<ResolveInfo> allInstalledPaymentApps = List<ResolveInfo> allInstalledPaymentApps =
mPackageManagerDelegate.getActivitiesThatCanRespondToIntentWithMetaData( mPackageManagerDelegate.getActivitiesThatCanRespondToIntentWithMetaData(
new Intent(AndroidPaymentApp.ACTION_PAY)); new Intent(WebPaymentIntentHelper.ACTION_PAY));
if (allInstalledPaymentApps.isEmpty()) { if (allInstalledPaymentApps.isEmpty()) {
onAllAppsFoundAndValidated(); onAllAppsFoundAndValidated();
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment