[Payments] Fix focus bug in the expiration date CVC unmaskp prompt.

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;
@@ skipping 65 matching lines @@
     private int mThisYear;
     private int mThisMonth;
     private boolean mValidationWaitsForCalendarTask;
 
     private String mCvcErrorMessage;
     private String mExpirationMonthErrorMessage;
     private String mExpirationYearErrorMessage;
     private String mExpirationDateErrorMessage;
     private String mCvcAndExpirationErrorMessage;
 
-    private boolean mStartedTypingMonth;
-    private boolean mStartedTypingYear;
-    private boolean mStartedTypingCvc;
+    private boolean mDidFocusOnMonth;
+    private boolean mDidFocusOnYear;
+    private boolean mDidFocusOnCvc;
 
     private static final int EXPIRATION_FIELDS_LENGTH = 2;
 
     public static final int ERROR_TYPE_EXPIRATION_MONTH = 1;
     public static final int ERROR_TYPE_EXPIRATION_YEAR = 2;
     public static final int ERROR_TYPE_EXPIRATION_DATE = 3;
     public static final int ERROR_TYPE_CVC = 4;
     public static final int ERROR_TYPE_CVC_AND_EXPIRATION = 5;
     public static final int ERROR_TYPE_NOT_ENOUGH_INFO = 6;
     public static final int ERROR_TYPE_NONE = 7;
@@ skipping 98 matching lines @@
 
         mShouldRequestExpirationDate = shouldRequestExpirationDate;
         mThisYear = -1;
         mThisMonth = -1;
         if (mShouldRequestExpirationDate) new CalendarTask().execute();
 
         // Create the listeners to be notified when the user focuses out the input fields.
         mCardUnmaskInput.setOnFocusChangeListener(new OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
+                mDidFocusOnCvc = true;
                 validate();
             }
         });
         mMonthInput.setOnFocusChangeListener(new OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
+                mDidFocusOnMonth = true;
                 validate();
             }
         });
         mYearInput.setOnFocusChangeListener(new OnFocusChangeListener() {
             @Override
             public void onFocusChange(View v, boolean hasFocus) {
+                mDidFocusOnYear = true;
                 validate();
             }
         });
 
-        // Create the listeners to be notified when the user types into the input fields.
-        mCardUnmaskInput.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable s) {}
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                mStartedTypingCvc = true;
-            }
-        });
-        mMonthInput.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable s) {}
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                mStartedTypingMonth = true;
-            }
-        });
-        mYearInput.addTextChangedListener(new TextWatcher() {
-            @Override
-            public void afterTextChanged(Editable s) {}
-
-            @Override
-            public void beforeTextChanged(CharSequence s, int start, int count, int after) {}
-
-            @Override
-            public void onTextChanged(CharSequence s, int start, int before, int count) {
-                mStartedTypingYear = true;
-            }
-        });
-
         // Load the error messages to show to the user.
         Resources resources = context.getResources();
         mCvcErrorMessage =
                 resources.getString(R.string.autofill_card_unmask_prompt_error_try_again_cvc);
         mExpirationMonthErrorMessage = resources.getString(
                 R.string.autofill_card_unmask_prompt_error_try_again_expiration_month);
         mExpirationYearErrorMessage = resources.getString(
                 R.string.autofill_card_unmask_prompt_error_try_again_expiration_year);
         mExpirationDateErrorMessage = resources.getString(
                 R.string.autofill_card_unmask_prompt_error_try_again_expiration_date);
@@ skipping 229 matching lines @@
     /**
      * Moves the focus to the next field based on the value of the fields and the specified type of
      * error found for the unmask field(s).
      *
      * @param errorType The type of error detected.
      */
     private void moveFocus(@ErrorType int errorType) {
         if (errorType == ERROR_TYPE_NOT_ENOUGH_INFO) {
             if (mMonthInput.isFocused()
                     && mMonthInput.getText().length() == EXPIRATION_FIELDS_LENGTH) {
-                mYearInput.requestFocus();
+                // The user just finished typing in the month field and there are no validation
+                // errors.
+                if (mYearInput.getText().length() == EXPIRATION_FIELDS_LENGTH) {
+                    // Year was already filled, move focus to CVC field.
+                    mCardUnmaskInput.requestFocus();
+                    mDidFocusOnCvc = true;
+                } else {
+                    // Year was not filled, move focus there.
+                    mYearInput.requestFocus();
+                    mDidFocusOnYear = true;
+                }
             } else if (mYearInput.isFocused()
                     && mYearInput.getText().length() == EXPIRATION_FIELDS_LENGTH) {
+                // The user just finished typing in the year field and there are no validation
+                // errors. Move focus to CVC field.
                 mCardUnmaskInput.requestFocus();
+                mDidFocusOnCvc = true;
             }
         }
     }
 
     /**
      * Shows (or removes) the appropriate error message and apply the error filter to the
      * appropriate fields depending on the error type.
      *
      * @param errorType The type of error detected.
      */
@@ skipping 66 matching lines @@
      * @return The ErrorType value representing the type of error found for the unmask fields.
      */
     @ErrorType private int getExpirationAndCvcErrorType() {
         @ErrorType int errorType = ERROR_TYPE_NONE;
 
         if (mShouldRequestExpirationDate) errorType = getExpirationDateErrorType();
 
         // If the CVC is valid, return the error type determined so far.
         if (isCvcValid()) return errorType;
 
-        if (mStartedTypingCvc && !mCardUnmaskInput.isFocused()) {
+        if (mDidFocusOnCvc && !mCardUnmaskInput.isFocused()) {
             // The CVC is invalid and the user has typed in the CVC field, but is not focused on it
             // now. Add the CVC error to the current error.
             if (errorType == ERROR_TYPE_NONE || errorType == ERROR_TYPE_NOT_ENOUGH_INFO) {
                 errorType = ERROR_TYPE_CVC;
             } else {
                 errorType = ERROR_TYPE_CVC_AND_EXPIRATION;
             }
         } else {
             // The CVC is invalid but the user is not done with the field.
             // If no other errors were detected, set that there is not enough information.
@@ skipping 12 matching lines @@
      */
     @ErrorType private int getExpirationDateErrorType() {
         if (mThisYear == -1 || mThisMonth == -1) {
             mValidationWaitsForCalendarTask = true;
             return ERROR_TYPE_NOT_ENOUGH_INFO;
         }
 
         int month = getMonth();
         if (month < 1 || month > 12) {
             if (mMonthInput.getText().length() == EXPIRATION_FIELDS_LENGTH
-                    || (!mMonthInput.isFocused() && mStartedTypingMonth)) {
+                    || (!mMonthInput.isFocused() && mDidFocusOnMonth)) {
                 // mFinishedTypingMonth = true;
                 return ERROR_TYPE_EXPIRATION_MONTH;
             }
             return ERROR_TYPE_NOT_ENOUGH_INFO;
         }
 
         int year = getFourDigitYear();
         if (year < mThisYear || year > mThisYear + 10) {
             if (mYearInput.getText().length() == EXPIRATION_FIELDS_LENGTH
-                    || (!mYearInput.isFocused() && mStartedTypingYear)) {
+                    || (!mYearInput.isFocused() && mDidFocusOnYear)) {
                 // mFinishedTypingYear = true;
                 return ERROR_TYPE_EXPIRATION_YEAR;
             }
             return ERROR_TYPE_NOT_ENOUGH_INFO;
         }
 
         if (year == mThisYear && month < mThisMonth) {
             return ERROR_TYPE_EXPIRATION_DATE;
         }
 
@@ skipping 131 matching lines @@
     @VisibleForTesting
     public AlertDialog getDialogForTest() {
         return mDialog;
     }
 
     @VisibleForTesting
     public String getErrorMessage() {
         return mErrorMessage.getText().toString();
     }
 }