Automatically submit phone verification codes when possible (#1558)

Author: SUPERCILEX

.travis.yml

@@ -15,7 +15,7 @@ cache:
     - $HOME/.android/build-cache
 before_install:
   - mkdir "$ANDROID_HOME/licenses" || true
-  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55\nd56f5187479451eabf01fb78af6dfcb131a6481e" > "$ANDROID_HOME/licenses/android-sdk-license"
+  - echo -e "\n8933bad161af4178b1185d1a37fbf41ea5269c55\n24333f8a63b6825ea9c5514f83c2829b004d1fee" > "$ANDROID_HOME/licenses/android-sdk-license"
   - echo -e "\n84831b9409646a918e30573bab4c9c91346d8abd\n504667f4c0de7af1a06de9f4b1727b84351f2910" > "$ANDROID_HOME/licenses/android-sdk-preview-license"
 android:
   components:

auth/src/main/java/com/firebase/ui/auth/ui/phone/CheckPhoneNumberFragment.java

@@ -62,7 +62,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         mVerificationHandler = ViewModelProviders.of(requireActivity())
                 .get(PhoneNumberVerificationHandler.class);
-        mCheckPhoneHandler = ViewModelProviders.of(requireActivity())
+        mCheckPhoneHandler = ViewModelProviders.of(this)
                 .get(CheckPhoneHandler.class);
     }
 
@@ -124,6 +124,9 @@ protected void onFailure(@NonNull Exception e) {
         // Fragment back stacks are the stuff of nightmares (what's new?): the fragment isn't
         // destroyed so its state isn't saved and we have to rely on an instance field. Sigh.
         mCalled = true;
+
+        // DON'T REMOVE
+        setDefaultCountryForSpinner();
     }
 
     @Override
@@ -202,8 +205,6 @@ private void setupCountrySpinner() {
         Bundle params = getArguments().getBundle(ExtraConstants.PARAMS);
         mCountryListSpinner.init(params);
 
-        setDefaultCountryForSpinner();
-
         // Clear error when spinner is clicked on
         mCountryListSpinner.setOnClickListener(new View.OnClickListener() {
             @Override

auth/src/main/java/com/firebase/ui/auth/ui/phone/PhoneActivity.java

@@ -22,6 +22,7 @@
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
 import android.support.design.widget.TextInputLayout;
+import android.support.v4.app.FragmentManager;
 import android.widget.Toast;
 
 import com.firebase.ui.auth.ErrorCodes;
@@ -83,7 +84,18 @@ protected void onFailure(@NonNull Exception e) {
             protected void onSuccess(@NonNull PhoneVerification verification) {
                 if (verification.isAutoVerified()) {
                     Toast.makeText(
-                            PhoneActivity.this, R.string.fui_auto_verified, Toast.LENGTH_LONG).show();
+                            PhoneActivity.this,
+                            R.string.fui_auto_verified,
+                            Toast.LENGTH_LONG
+                    ).show();
+
+                    FragmentManager manager = getSupportFragmentManager();
+                    if (manager.findFragmentByTag(SubmitConfirmationCodeFragment.TAG) != null) {
+                        // Ensure the submit code screen isn't visible if there's no code to submit.
+                        // It's possible to get into this state when an SMS is sent, but then
+                        // automatically retrieved.
+                        manager.popBackStack();
+                    }
                 }
 
                 handler.startSignIn(verification.getCredential(), new IdpResponse.Builder(

auth/src/main/java/com/firebase/ui/auth/ui/phone/SubmitConfirmationCodeFragment.java

@@ -14,38 +14,45 @@
 
 package com.firebase.ui.auth.ui.phone;
 
+import android.arch.lifecycle.Observer;
 import android.arch.lifecycle.ViewModelProviders;
+import android.content.ClipData;
+import android.content.ClipboardManager;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.annotation.RestrictTo;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
-import android.widget.Button;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 
+import com.firebase.ui.auth.IdpResponse;
 import com.firebase.ui.auth.R;
+import com.firebase.ui.auth.data.model.Resource;
+import com.firebase.ui.auth.data.model.State;
 import com.firebase.ui.auth.ui.FragmentBase;
 import com.firebase.ui.auth.util.ExtraConstants;
 import com.firebase.ui.auth.util.data.PrivacyDisclosureUtils;
 import com.firebase.ui.auth.util.ui.BucketedTextChangeListener;
-import com.firebase.ui.auth.util.ui.ImeHelper;
+import com.firebase.ui.auth.viewmodel.phone.PhoneProviderResponseHandler;
 
 import java.util.concurrent.TimeUnit;
 
 /**
- * Display confirmation code to verify phone numbers input in {{@link CheckPhoneNumberFragment}}
+ * Display confirmation code to verify phone numbers input in {@link CheckPhoneNumberFragment}
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
 public class SubmitConfirmationCodeFragment extends FragmentBase {
 
     public static final String TAG = "SubmitConfirmationCodeFragment";
 
+    private static final int VERIFICATION_CODE_LENGTH = 6;
     private static final long RESEND_WAIT_MILLIS = 15000;
     private static final long TICK_INTERVAL_MILLIS = 500;
     private static final String EXTRA_MILLIS_UNTIL_FINISHED = "millis_until_finished";
@@ -66,9 +73,10 @@ public void run() {
     private TextView mResendCodeTextView;
     private TextView mCountDownTextView;
     private SpacedEditText mConfirmationCodeEditText;
-    private Button mSubmitConfirmationButton;
     private long mMillisUntilFinished = RESEND_WAIT_MILLIS;
 
+    private boolean mHasResumed;
+
     public static SubmitConfirmationCodeFragment newInstance(String phoneNumber) {
         SubmitConfirmationCodeFragment fragment = new SubmitConfirmationCodeFragment();
         Bundle args = new Bundle();
@@ -103,11 +111,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mCountDownTextView = view.findViewById(R.id.ticker);
         mResendCodeTextView = view.findViewById(R.id.resend_code);
         mConfirmationCodeEditText = view.findViewById(R.id.confirmation_code);
-        mSubmitConfirmationButton = view.findViewById(R.id.submit_confirmation_code);
 
         requireActivity().setTitle(getString(R.string.fui_verify_your_phone_title));
         processCountdownTick();
-        setupSubmitConfirmationButton();
         setupConfirmationCodeEditText();
         setupEditPhoneNumberTextView();
         setupResendConfirmationCodeTextView();
@@ -117,6 +123,22 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
                 view.<TextView>findViewById(R.id.email_footer_tos_and_pp_text));
     }
 
+    @Override
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        ViewModelProviders.of(requireActivity())
+                .get(PhoneProviderResponseHandler.class)
+                .getOperation()
+                .observe(this, new Observer<Resource<IdpResponse>>() {
+                    @Override
+                    public void onChanged(@Nullable Resource<IdpResponse> resource) {
+                        if (resource.getState() == State.FAILURE) {
+                            mConfirmationCodeEditText.setText("");
+                        }
+                    }
+                });
+    }
+
     @Override
     public void onStart() {
         super.onStart();
@@ -125,6 +147,32 @@ public void onStart() {
                 .showSoftInput(mConfirmationCodeEditText, 0);
     }
 
+    @Override
+    public void onResume() {
+        super.onResume();
+        if (!mHasResumed) {
+            // Don't check for codes before we've even had the chance to send one.
+            mHasResumed = true;
+            return;
+        }
+
+        ClipData clip = ContextCompat.getSystemService(requireContext(), ClipboardManager.class)
+                .getPrimaryClip();
+        if (clip != null && clip.getItemCount() == 1) {
+            CharSequence candidate = clip.getItemAt(0).getText();
+            if (candidate != null && candidate.length() == VERIFICATION_CODE_LENGTH) {
+                try {
+                    Integer.parseInt(candidate.toString());
+
+                    // We have a number! Try to submit it.
+                    mConfirmationCodeEditText.setText(candidate);
+                } catch (NumberFormatException ignored) {
+                    // Turns out it wasn't a number
+                }
+            }
+        }
+    }
+
     @Override
     public void onSaveInstanceState(@NonNull Bundle outState) {
         mLooper.removeCallbacks(mCountdown);
@@ -139,41 +187,19 @@ public void onDestroy() {
         mLooper.removeCallbacks(mCountdown);
     }
 
-    private void setupSubmitConfirmationButton() {
-        mSubmitConfirmationButton.setEnabled(false);
-        mSubmitConfirmationButton.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                submitCode();
-            }
-        });
-    }
-
     private void setupConfirmationCodeEditText() {
         mConfirmationCodeEditText.setText("------");
         mConfirmationCodeEditText.addTextChangedListener(new BucketedTextChangeListener(
-                mConfirmationCodeEditText, 6, "-",
+                mConfirmationCodeEditText, VERIFICATION_CODE_LENGTH, "-",
                 new BucketedTextChangeListener.ContentChangeCallback() {
                     @Override
-                    public void whileComplete() {
-                        mSubmitConfirmationButton.setEnabled(true);
+                    public void whenComplete() {
+                        submitCode();
                     }
 
                     @Override
-                    public void whileIncomplete() {
-                        mSubmitConfirmationButton.setEnabled(false);
-                    }
+                    public void whileIncomplete() {}
                 }));
-
-        ImeHelper.setImeOnDoneListener(mConfirmationCodeEditText,
-                new ImeHelper.DonePressedListener() {
-                    @Override
-                    public void onDonePressed() {
-                        if (mSubmitConfirmationButton.isEnabled()) {
-                            submitCode();
-                        }
-                    }
-                });
     }
 
     private void setupEditPhoneNumberTextView() {
@@ -222,13 +248,11 @@ private void submitCode() {
 
     @Override
     public void showProgress(int message) {
-        mSubmitConfirmationButton.setEnabled(false);
         mProgressBar.setVisibility(View.VISIBLE);
     }
 
     @Override
     public void hideProgress() {
-        mSubmitConfirmationButton.setEnabled(true);
         mProgressBar.setVisibility(View.INVISIBLE);
     }
 }

auth/src/main/java/com/firebase/ui/auth/util/ui/BucketedTextChangeListener.java

@@ -46,7 +46,7 @@ public interface ContentChangeCallback {
          * Idempotent function invoked by the listener when the edit text changes and is of expected
          * length
          */
-        void whileComplete();
+        void whenComplete();
 
         /**
          * Idempotent function invoked by the listener when the edit text changes and is not of
@@ -114,7 +114,7 @@ public void onTextChanged(
 
         // 4) Callback listeners waiting on content to be of expected length
         if (enteredContentLength == mExpectedContentLength && mCallback != null) {
-            mCallback.whileComplete();
+            mCallback.whenComplete();
         } else if (mCallback != null) {
             mCallback.whileIncomplete();
         }

auth/src/main/res/layout/fui_confirmation_code_layout.xml

@@ -61,13 +61,6 @@
 
             </android.support.design.widget.TextInputLayout>
 
-            <Button
-                android:id="@+id/submit_confirmation_code"
-                style="@style/FirebaseUI.VerifyPhoneButton"
-                android:layout_gravity="end"
-                android:text="@string/fui_continue_phone_login"
-                app:layout_constraintTop_toBottomOf="@+id/confirmation_code_layout" />
-
             <TextView
                 android:id="@+id/ticker"
                 style="@style/FirebaseUI.Text.T08"
@@ -80,7 +73,7 @@
                 android:textIsSelectable="false"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/submit_confirmation_code"
+                app:layout_constraintTop_toBottomOf="@+id/confirmation_code_layout"
                 tools:text="Resend in 0:01" />
 
             <TextView

auth/src/main/res/values-ar/strings.xml

@@ -83,7 +83,6 @@
     <string name="fui_auto_verified">تمّ التحقّق تلقائيًا من رقم الهاتف.</string>
     <string name="fui_resend_code">إعادة إرسال الرمز</string>
     <string name="fui_verify_phone_number">تأكيد ملكية رقم الهاتف</string>
-    <string name="fui_continue_phone_login">متابعة</string>
     <string name="fui_sms_terms_of_service">عند النقر على “%1$s”، قد يتمّ إرسال رسالة قصيرة SMS وقد يتمّ تطبيق رسوم الرسائل والبيانات.</string>
     <string name="fui_sms_terms_of_service_and_privacy_policy_extended">يشير النقر على “%1$s” إلى موافقتك على %2$s و%3$s. وقد يتمّ إرسال رسالة قصيرة كما قد تنطبق رسوم الرسائل والبيانات.</string>
 </resources>

auth/src/main/res/values-b+es+419/strings.xml

@@ -83,7 +83,6 @@
     <string name="fui_auto_verified">Se verificó automáticamente el número de teléfono</string>
     <string name="fui_resend_code">Reenviar código</string>
     <string name="fui_verify_phone_number">Verificar número de teléfono</string>
-    <string name="fui_continue_phone_login">Continuar</string>
     <string name="fui_sms_terms_of_service">Si presionas “%1$s”, se enviará un SMS. Se aplicarán las tarifas de mensajes y datos.</string>
     <string name="fui_sms_terms_of_service_and_privacy_policy_extended">Si presionas “%1$s”, indicas que aceptas nuestras %2$s y %3$s. Es posible que se te envíe un SMS. Podrían aplicarse las tarifas de mensajes y datos.</string>
 </resources>

auth/src/main/res/values-bg/strings.xml

@@ -83,7 +83,6 @@
     <string name="fui_auto_verified">Телефонният номер е потвърден автоматично</string>
     <string name="fui_resend_code">Повторно изпращане на кода</string>
     <string name="fui_verify_phone_number">Потвърждаване на телефонния номер</string>
-    <string name="fui_continue_phone_login">Напред</string>
     <string name="fui_sms_terms_of_service">Докосвайки „%1$s“, може да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
     <string name="fui_sms_terms_of_service_and_privacy_policy_extended">Докосвайки „%1$s“, приемате нашите %2$s и %3$s. Възможно е да получите SMS съобщение. То може да се таксува по тарифите за данни и SMS.</string>
 </resources>

auth/src/main/res/values-bn/strings.xml

@@ -83,7 +83,6 @@
     <string name="fui_auto_verified">ফোন নম্বরটি নিজে থেকে যাচাই করা হয়েছে</string>
     <string name="fui_resend_code">কোডটি আবার পাঠান</string>
     <string name="fui_verify_phone_number">ফোন নম্বর যাচাই করুন</string>
-    <string name="fui_continue_phone_login">চালিয়ে যান</string>
     <string name="fui_sms_terms_of_service">%1$s এ ট্যাপ করলে আপনি একটি এসএমএস পাঠাতে পারেন। মেসেজ ও ডেটার চার্জ প্রযোজ্য।</string>
     <string name="fui_sms_terms_of_service_and_privacy_policy_extended">“%1$s” বোতামে ট্যাপ করার অর্থ, আপনি আমাদের %2$s এবং %3$s-এর সাথে সম্মত। একটি এসএমএস পাঠানো হতে পারে। মেসেজ এবং ডেটার উপরে প্রযোজ্য চার্জ লাগতে পারে।</string>
 </resources>