chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java - Issue 2604193002: Detect locally installed native Android payment apps.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

Issue 2604193002: Detect locally installed native Android payment apps. (Closed)

Patch Set: null-check Created 3 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/payments/AndroidPaymentAppFactory.java ('k') | chrome/android/java/src/org/chromium/chrome/browser/payments/PaymentAppFactory.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

diff --git a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

index 5f6d3b4e59ed26508d95f34e85aa963de0d473e5..45e3435e7ad99d33cb0051c85a5feec340b6893d 100644

--- a/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

+++ b/chrome/android/java/src/org/chromium/chrome/browser/payments/CardEditor.java

@@ -23,6 +23,7 @@ import org.chromium.chrome.browser.payments.ui.EditorModel;

import org.chromium.chrome.browser.preferences.autofill.AutofillProfileBridge.DropdownKeyValue;

import org.chromium.content.browser.ContentViewCore;

import org.chromium.content_public.browser.WebContents;

+import org.chromium.ui.base.WindowAndroid;

import java.text.SimpleDateFormat;

import java.util.ArrayList;

@@ -407,10 +408,14 @@ public class CardEditor extends EditorBase<AutofillPaymentInstrument>

// Card scanner is expensive to query.

if (mCardScanner == null) {

- mCardScanner = CreditCardScanner.create(mContext,

- ContentViewCore.fromWebContents(mWebContents).getWindowAndroid(),

- this);

- mCanScan = mCardScanner.canScan();

+ ContentViewCore contentView = ContentViewCore.fromWebContents(mWebContents);

+ if (contentView != null) {

+ WindowAndroid window = contentView.getWindowAndroid();

+ if (window != null) {

+ mCardScanner = CreditCardScanner.create(mContext, window, this);

+ mCanScan = mCardScanner.canScan();

+ }

}

// Card number is validated.