Reland: Test dismissing CVC prompt for PaymentRequest

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

 // Copyright 2014 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 android.content.DialogInterface;
 import android.content.res.Resources;
 import android.graphics.Color;
 import android.graphics.ColorFilter;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
 import android.support.v4.view.MarginLayoutParamsCompat;
 import android.support.v4.view.ViewCompat;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ skipping 19 matching lines @@
  * A prompt that bugs users to enter their CVC when unmasking a Wallet instrument (credit card).
  */
 public class CardUnmaskPrompt
         implements DialogInterface.OnDismissListener, TextWatcher, OnClickListener {
     private static CardUnmaskObserverForTest sObserverForTest;
 
     private final CardUnmaskPromptDelegate mDelegate;
     private final CardUnmaskObserverForTest mObserverForTest;
     private final AlertDialog mDialog;
     private boolean mShouldRequestExpirationDate;
-    private final int mThisYear;
-    private final int mThisMonth;
 
     private final View mMainView;
     private final TextView mInstructions;
     private final TextView mNoRetryErrorMessage;
     private final EditText mCardUnmaskInput;
     private final EditText mMonthInput;
     private final EditText mYearInput;
     private final View mExpirationContainer;
     private final TextView mNewCardLink;
     private final TextView mErrorMessage;
     private final CheckBox mStoreLocallyCheckbox;
     private final ImageView mStoreLocallyTooltipIcon;
     private PopupWindow mStoreLocallyTooltipPopup;
     private final ViewGroup mControlsContainer;
     private final View mVerificationOverlay;
     private final ProgressBar mVerificationProgressBar;
     private final TextView mVerificationView;
 
+    private int mThisYear;
+    private int mThisMonth;
+    private boolean mValidationWaitsForCalendarTask;
+
     /**
      * An interface to handle the interaction with an CardUnmaskPrompt object.
      */
     public interface CardUnmaskPromptDelegate {
         /**
          * Called when the dialog has been dismissed.
          */
         void dismissed();
 
         /**
@@ skipping 74 matching lines @@
 
         mDialog = new AlertDialog.Builder(context, R.style.AlertDialogTheme)
                 .setTitle(title)
                 .setView(v)
                 .setNegativeButton(R.string.cancel, null)
                 .setPositiveButton(confirmButtonLabel, null)
                 .create();
         mDialog.setOnDismissListener(this);
 
         mShouldRequestExpirationDate = shouldRequestExpirationDate;
-        mThisYear = Calendar.getInstance().get(Calendar.YEAR);
-        mThisMonth = Calendar.getInstance().get(Calendar.MONTH) + 1;
+        mThisYear = -1;
+        mThisMonth = -1;
+        if (mShouldRequestExpirationDate) new CalendarTask().execute();

[gone, 2016/05/11 17:47:46]

Do you need to disable the button until the date has been validated?

[please use gerrit instead, 2016/05/11 17:58:56]

It's disabled on lines 199-200:

  Button verifyButton = mDialog.getButton(AlertDialog.BUTTON_POSITIVE);
  verifyButton.setEnabled(false);

And re-enabled only if the date is valid on lines 274-281:

  @Override
  public void afterTextChanged(Editable s) {
    validate();
  }

  private void validate() {
    mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(areInputsValid());
  }

+    }
+
+    /**
+     * Avoids disk reads for timezone when getting the default instance of Calendar.
+     */
+    private class CalendarTask extends AsyncTask<Void, Void, Calendar> {
+        @Override
+        protected Calendar doInBackground(Void... unused) {
+            return Calendar.getInstance();
+        }
+
+        @Override
+        protected void onPostExecute(Calendar result) {
+            mThisYear = result.get(Calendar.YEAR);
+            mThisMonth = result.get(Calendar.MONTH) + 1;
+            if (mValidationWaitsForCalendarTask) validate();
+        }
     }
 
     public void show() {
         mDialog.show();
 
         showExpirationDateInputsInputs();
 
         // Override the View.OnClickListener so that pressing the positive button doesn't dismiss
         // the dialog.
         Button verifyButton = mDialog.getButton(AlertDialog.BUTTON_POSITIVE);
@@ skipping 66 matching lines @@
         }
     }
 
     @Override
     public void onDismiss(DialogInterface dialog) {
         mDelegate.dismissed();
     }
 
     @Override
     public void afterTextChanged(Editable s) {
+        validate();
+    }
+
+    private void validate() {
         mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setEnabled(areInputsValid());
     }
 
     @Override
     public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
 
     @Override
     public void onTextChanged(CharSequence s, int start, int before, int count) {}
 
     @Override
@@ skipping 80 matching lines @@
         View view = mShouldRequestExpirationDate ? mMonthInput : mCardUnmaskInput;
         imm.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
         view.sendAccessibilityEvent(AccessibilityEvent.TYPE_VIEW_FOCUSED);
         if (mObserverForTest != null) {
             mObserverForTest.onCardUnmaskReadyForInput(CardUnmaskPrompt.this);
         }
     }
 
     private boolean areInputsValid() {
         if (mShouldRequestExpirationDate) {
+            if (mThisYear == -1 || mThisMonth == -1) {
+                mValidationWaitsForCalendarTask = true;
+                return false;
+            }
+
             int month = -1;
             try {
                 month = Integer.parseInt(mMonthInput.getText().toString());
                 if (month < 1 || month > 12) return false;
             } catch (NumberFormatException e) {
                 return false;
             }
 
             int year = getFourDigitYear();
             if (year < mThisYear || year > mThisYear + 10) return false;
@@ skipping 107 matching lines @@
     @VisibleForTesting
     public static void setObserverForTest(CardUnmaskObserverForTest observerForTest) {
         sObserverForTest = observerForTest;
     }
 
     @VisibleForTesting
     public AlertDialog getDialogForTest() {
         return mDialog;
     }
 }