Card unmasking without form filling

chrome/android/java/src/org/chromium/chrome/browser/autofill/PersonalDataManager.java

 // Copyright 2013 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.autofill;
 
 import android.content.Context;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ResourceId;
+import org.chromium.content_public.browser.WebContents;
 
 import java.util.ArrayList;
 import java.util.List;
 
 /**
  * Android wrapper of the PersonalDataManager which provides access from the Java
  * layer.
  *
  * Only usable from the UI thread as it's primary purpose is for supporting the Android
  * preferences UI.
  *
  * See chrome/browser/autofill/personal_data_manager.h for more details.
  */
 @JNINamespace("autofill")
 public class PersonalDataManager {
 
     /**
      * Observer of PersonalDataManager events.
      */
     public interface PersonalDataManagerObserver {
         /**
          * Called when the data is changed.
          */
         public abstract void onPersonalDataChanged();
     }
 
     /**
+     * Callback for full card request.
+     */
+    public interface FullCardRequestDelegate {
+        /**
+         * Called when user provided the full card details, including the CVC and the full PAN.
+         *
+         * @param card The full card.
+         * @param cvc The CVC for the card.
+         */
+        public abstract void onFullCardDetails(CreditCard card, String cvc);

[Ted C, 2016/04/22 23:34:56]

drop public and abstract in interfaces

[please use gerrit instead, 2016/04/23 01:17:42]

Done.

+
+        /**
+         * Called when user did not provide full card details.
+         */
+        public abstract void onFullCardError();
+    }
+
+    /**
      * Autofill address information.
      */
     public static class AutofillProfile {
         private String mGUID;
         private String mOrigin;
         private boolean mIsLocal;
         private String mFullName;
         private String mCompanyName;
         private String mStreetAddress;
         private String mRegion;
@@ skipping 356 matching lines @@
         ThreadUtils.assertOnUiThread();
         if (sManager == null) {
             sManager = new PersonalDataManager();
         }
         return sManager;
     }
 
     private final long mPersonalDataManagerAndroid;
     private final List<PersonalDataManagerObserver> mDataObservers =
             new ArrayList<PersonalDataManagerObserver>();
+    private FullCardRequestDelegate mFullCardRequestDelegate;
 
     private PersonalDataManager() {
         // Note that this technically leaks the native object, however, PersonalDataManager
         // is a singleton that lives forever and there's no clean shutdown of Chrome on Android
         mPersonalDataManagerAndroid = nativeInit();
     }
 
     /**
      * Called from native when template URL service is done loading.
      */
@@ skipping 77 matching lines @@
 
     public void deleteCreditCard(String guid) {
         ThreadUtils.assertOnUiThread();
         nativeRemoveByGUID(mPersonalDataManagerAndroid, guid);
     }
 
     public void clearUnmaskedCache(String guid) {
         nativeClearUnmaskedCache(mPersonalDataManagerAndroid, guid);
     }
 
+    public void unmaskCard(WebContents webContents, String guid, FullCardRequestDelegate delegate) {
+        if (mFullCardRequestDelegate != null) {

[Ted C, 2016/04/22 23:34:56]

this looks fishy to me.  you cancel the previous delegate, but won't the new
delegate get called with the pending onFullCardDetails that comes next?

I think you should pass down the delegate.  Add
@CalledByNative("FullCardRequestDelegate") to the interface methods above. 
Create a inner class that keeps a scoped global ref to the java object and
extends the c++ FullCardRequestDelegate, calling the corresponding methods on
the interface above.  No need to track delegates and allows multiple callers w/o
chances of scary leakages.

[please use gerrit instead, 2016/04/23 01:17:43]

Done.

+            delegate.onFullCardError();
+            return;
+        }
+
+        mFullCardRequestDelegate = delegate;
+        nativeGetFullCardForPaymentRequest(mPersonalDataManagerAndroid, webContents, guid);
+    }
+
+    @CalledByNative
+    private void onFullCardDetails(CreditCard card, String cvc) {
+        ThreadUtils.assertOnUiThread();
+        assert mFullCardRequestDelegate != null;
+        mFullCardRequestDelegate.onFullCardDetails(card, cvc);
+        mFullCardRequestDelegate = null;
+    }
+
+    @CalledByNative
+    private void onFullCardError() {
+        ThreadUtils.assertOnUiThread();
+        assert mFullCardRequestDelegate != null;
+        mFullCardRequestDelegate.onFullCardError();
+        mFullCardRequestDelegate = null;
+    }
+
     /**
      * @return Whether the Autofill feature is enabled.
      */
     public static boolean isAutofillEnabled() {
         return nativeIsAutofillEnabled();
     }
 
     /**
      * Enables or disables the Autofill feature.
      * @param enable True to disable Autofill, false otherwise.
@@ skipping 36 matching lines @@
     private native int nativeGetCreditCardCount(long nativePersonalDataManagerAndroid);
     private native CreditCard nativeGetCreditCardByIndex(long nativePersonalDataManagerAndroid,
             int index);
     private native CreditCard nativeGetCreditCardByGUID(long nativePersonalDataManagerAndroid,
             String guid);
     private native String nativeSetCreditCard(long nativePersonalDataManagerAndroid,
             CreditCard card);
     private native void nativeRemoveByGUID(long nativePersonalDataManagerAndroid, String guid);
     private native void nativeClearUnmaskedCache(
             long nativePersonalDataManagerAndroid, String guid);
+    private native void nativeGetFullCardForPaymentRequest(long nativePersonalDataManagerAndroid,
+            WebContents webContents, String guid);
     private static native boolean nativeIsAutofillEnabled();
     private static native void nativeSetAutofillEnabled(boolean enable);
     private static native boolean nativeIsAutofillManaged();
     private static native boolean nativeIsPaymentsIntegrationEnabled();
     private static native void nativeSetPaymentsIntegrationEnabled(boolean enable);
     private static native String nativeToCountryCode(String countryName);
 }