Merge branch 'master' into version-3.0.0-dev

Change-Id: I35d763e9e3b77dd89baa0068d4c2e0f83d02d5ab

Author: samtstern

README.md

@@ -39,16 +39,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI Database only
-    compile 'com.firebaseui:firebase-ui-database:2.3.0'
+    compile 'com.firebaseui:firebase-ui-database:2.4.0'
 
     // FirebaseUI Auth only
-    compile 'com.firebaseui:firebase-ui-auth:2.3.0'
+    compile 'com.firebaseui:firebase-ui-auth:2.4.0'
 
     // FirebaseUI Storage only
-    compile 'com.firebaseui:firebase-ui-storage:2.3.0'
+    compile 'com.firebaseui:firebase-ui-storage:2.4.0'
 
     // Single target that includes all FirebaseUI libraries above
-    compile 'com.firebaseui:firebase-ui:2.3.0'
+    compile 'com.firebaseui:firebase-ui:2.4.0'
 }
 ```
 
@@ -91,6 +91,7 @@ For convenience, here are some recent examples:
 
 | FirebaseUI Version | Firebase/Play Services Version |
 |--------------------|--------------------------------|
+| 2.4.0              | 11.4.0                         |
 | 2.3.0              | 11.0.4                         |
 | 2.2.0              | 11.0.4                         |
 | 2.1.1              | 11.0.2                         |

app/src/main/java/com/firebase/uidemo/auth/AuthUiActivity.java

@@ -205,7 +205,7 @@ public void signIn(View view) {
                         .setTosUrl(getSelectedTosUrl())
                         .setPrivacyPolicyUrl(getSelectedPrivacyPolicyUrl())
                         .setIsSmartLockEnabled(mEnableCredentialSelector.isChecked(),
-                                               mEnableHintSelector.isChecked())
+                                mEnableHintSelector.isChecked())
                         .setAllowNewEmailAccounts(mAllowNewEmailAccounts.isChecked())
                         .build(),
                 RC_SIGN_IN);

auth/README.md

@@ -46,10 +46,10 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    compile 'com.firebaseui:firebase-ui-auth:2.3.0'
+    compile 'com.firebaseui:firebase-ui-auth:2.4.0'
 
     // Required only if Facebook login support is required
-    compile('com.facebook.android:facebook-android-sdk:4.22.1')
+    compile('com.facebook.android:facebook-android-sdk:4.26.0')
 
     // Required only if Twitter login support is required
     compile("com.twitter.sdk.android:twitter-core:3.0.0@aar") { transitive = true }
@@ -256,6 +256,34 @@ startActivityForResult(
     RC_SIGN_IN);
 ```
 
+When using the phone verification provider and the number is known in advance, it is possible to
+provide a default phone number (in international format) that will be used to prepopulate the
+country code and phone number input fields. The user is still able to edit the number if desired.
+
+```java
+// Use a Bundle to hold the default number, and pass it to the Builder via setParams:
+Bundle params = new Bundle();
+params.putString(AuthUI.EXTRA_DEFAULT_PHONE_NUMBER, "+123456789");
+IdpConfig phoneConfigWithDefaultNumber =
+        new IdpConfig.Builder(AuthUI.PHONE_VERIFICATION_PROVIDER)
+                .setParams(params)
+                .build();
+```
+
+It is also possible to set a default country code along with a national number if a specific country
+is your app's target audience. This will take precedence over the full default phone number if both
+are provided.
+
+```java
+Bundle params = new Bundle();
+params.putString(AuthUI.EXTRA_DEFAULT_COUNTRY_CODE, "ca");
+params.putString(AuthUI.EXTRA_DEFAULT_NATIONAL_NUMBER, "23456789");
+IdpConfig phoneConfigWithDefaultCountryAndNationalNumber =
+        new IdpConfig.Builder(AuthUI.PHONE_VERIFICATION_PROVIDER)
+                .setParams(params)
+                .build();
+```
+
 #### Handling the sign-in response
 
 ##### Response codes
@@ -417,6 +445,7 @@ Second, ensure the three standard AppCompat color resources are defined with you
     <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
     <item name="colorAccent">@color/colorAccent</item>
 </style>
+```
 
 If you would like more control over FirebaseUI's styling, you can define your own custom style
 to override certain or all styling attributes. For example, a green sign-in theme:

auth/src/main/java/com/firebase/ui/auth/AuthUI.java

@@ -16,6 +16,7 @@
 
 import android.app.Activity;
 import android.content.Intent;
+import android.os.Bundle;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.support.annotation.CallSuper;
@@ -28,6 +29,7 @@
 
 import com.facebook.login.LoginManager;
 import com.firebase.ui.auth.provider.TwitterProvider;
+import com.firebase.ui.auth.ui.ExtraConstants;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.idp.AuthMethodPickerActivity;
 import com.firebase.ui.auth.util.GoogleSignInHelper;
@@ -104,6 +106,21 @@ public class AuthUI {
      */
     public static final String PHONE_VERIFICATION_PROVIDER = PhoneAuthProvider.PROVIDER_ID;
 
+    /**
+     * Bundle key for the default full phone number parameter.
+     */
+    public static final String EXTRA_DEFAULT_PHONE_NUMBER = ExtraConstants.EXTRA_PHONE;
+
+    /**
+     * Bundle key for the default phone country code parameter.
+     */
+    public static final String EXTRA_DEFAULT_COUNTRY_CODE = ExtraConstants.EXTRA_COUNTRY_CODE;
+
+    /**
+     * Bundle key for the default national phone number parameter.
+     */
+    public static final String EXTRA_DEFAULT_NATIONAL_NUMBER = ExtraConstants.EXTRA_NATIONAL_NUMBER;
+
     /**
      * Default value for logo resource, omits the logo from the {@link AuthMethodPickerActivity}.
      */
@@ -269,15 +286,21 @@ public SignInIntentBuilder createSignInIntentBuilder() {
     public static class IdpConfig implements Parcelable {
         private final String mProviderId;
         private final List<String> mScopes;
+        private final Bundle mParams;
 
-        private IdpConfig(@SupportedProvider @NonNull String providerId, List<String> scopes) {
+        private IdpConfig(
+                @SupportedProvider @NonNull String providerId,
+                List<String> scopes,
+                Bundle params) {
             mProviderId = providerId;
             mScopes = Collections.unmodifiableList(scopes);
+            mParams = params;
         }
 
         private IdpConfig(Parcel in) {
             mProviderId = in.readString();
             mScopes = Collections.unmodifiableList(in.createStringArrayList());
+            mParams = in.readBundle(getClass().getClassLoader());
         }
 
         @SupportedProvider
@@ -289,6 +312,10 @@ public List<String> getScopes() {
             return mScopes;
         }
 
+        public Bundle getParams() {
+            return mParams;
+        }
+
         public static final Creator<IdpConfig> CREATOR = new Creator<IdpConfig>() {
             @Override
             public IdpConfig createFromParcel(Parcel in) {
@@ -310,6 +337,7 @@ public int describeContents() {
         public void writeToParcel(Parcel parcel, int i) {
             parcel.writeString(mProviderId);
             parcel.writeStringList(mScopes);
+            parcel.writeBundle(mParams);
         }
 
         @Override
@@ -332,12 +360,14 @@ public String toString() {
             return "IdpConfig{" +
                     "mProviderId='" + mProviderId + '\'' +
                     ", mScopes=" + mScopes +
+                    ", mParams=" + mParams +
                     '}';
         }
 
         public static class Builder {
             @SupportedProvider private String mProviderId;
             private List<String> mScopes = new ArrayList<>();
+            private Bundle mParams = new Bundle();
 
             /**
              * Builds the configuration parameters for an identity provider.
@@ -372,8 +402,13 @@ public Builder setPermissions(List<String> permissions) {
                 return this;
             }
 
+            public Builder setParams(Bundle params) {
+                mParams = params;
+                return this;
+            }
+
             public IdpConfig build() {
-                return new IdpConfig(mProviderId, mScopes);
+                return new IdpConfig(mProviderId, mScopes, mParams);
             }
         }
     }
@@ -448,8 +483,8 @@ public T setAvailableProviders(@NonNull List<IdpConfig> idpConfigs) {
             for (IdpConfig config : idpConfigs) {
                 if (mProviders.contains(config)) {
                     throw new IllegalArgumentException("Each provider can only be set once. "
-                                                               + config.getProviderId()
-                                                               + " was set twice.");
+                            + config.getProviderId()
+                            + " was set twice.");
                 } else {
                     mProviders.add(config);
                 }

auth/src/main/java/com/firebase/ui/auth/provider/PhoneProvider.java

@@ -3,8 +3,10 @@
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Bundle;
 import android.support.annotation.LayoutRes;
 
+import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.R;
 import com.firebase.ui.auth.ui.FlowParameters;
 import com.firebase.ui.auth.ui.phone.PhoneVerificationActivity;
@@ -34,8 +36,16 @@ public int getButtonLayout() {
 
     @Override
     public void startLogin(Activity activity) {
+
+        Bundle params = null;
+        for (AuthUI.IdpConfig idpConfig : mFlowParameters.providerInfo) {
+            if (idpConfig.getProviderId().equals(AuthUI.PHONE_VERIFICATION_PROVIDER)) {
+                params = idpConfig.getParams();
+            }
+        }
+
         activity.startActivityForResult(
-                PhoneVerificationActivity.createIntent(activity, mFlowParameters, null),
+                PhoneVerificationActivity.createIntent(activity, mFlowParameters, params),
                 RC_PHONE_FLOW);
     }
 

auth/src/main/java/com/firebase/ui/auth/ui/ExtraConstants.java

@@ -26,5 +26,8 @@ public class ExtraConstants {
     public static final String EXTRA_USER = "extra_user";
     public static final String EXTRA_EMAIL = "extra_email";
     public static final String EXTRA_PHONE = "extra_phone_number";
+    public static final String EXTRA_COUNTRY_CODE = "extra_country_code";
+    public static final String EXTRA_NATIONAL_NUMBER = "extra_national_number";
     public static final String HAS_EXISTING_INSTANCE = "has_existing_instance";
+    public static final String EXTRA_PARAMS = "extra_params";
 }

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

@@ -38,10 +38,23 @@ public final class CompletableProgressDialog extends DialogFragment {
 
     public static CompletableProgressDialog show(FragmentManager manager) {
         CompletableProgressDialog dialog = new CompletableProgressDialog();
-        dialog.show(manager, TAG);
+        dialog.showAllowingStateLoss(manager, TAG);
         return dialog;
     }
 
+    /**
+     * This method is adapted from {@link #show(FragmentManager, String)}
+     */
+    public void showAllowingStateLoss(FragmentManager manager, String tag) {
+        // This prevents us from hitting FragmentManager.checkStateLoss() which
+        // throws a runtime exception if state has already been saved.
+        if (manager.isStateSaved()) {
+            return;
+        }
+
+        show(manager, tag);
+    }
+
     @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
@@ -60,12 +73,18 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
 
     public void onComplete(String msg) {
         setMessage(msg);
-        mProgress.setVisibility(View.GONE);
-        mSuccessImage.setVisibility(View.VISIBLE);
+
+        if (mProgress != null) {
+            mProgress.setVisibility(View.GONE);
+        }
+
+        if (mSuccessImage != null) {
+            mSuccessImage.setVisibility(View.VISIBLE);
+        }
     }
 
     public void setMessage(CharSequence message) {
-        if (mProgress != null) {
+        if (mProgress != null && mMessageView != null) {
             mMessageView.setText(message);
         } else {
             mMessage = message;

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

@@ -138,6 +138,22 @@ protected static PhoneNumber getPhoneNumber(@NonNull String providedPhoneNumber)
         return new PhoneNumber(phoneNumber, countryIso, countryCode);
     }
 
+    static PhoneNumber getPhoneNumber(
+            @NonNull String providedCountryIso, @NonNull String providedNationalNumber) {
+        Integer countryCode = getCountryCode(providedCountryIso);
+        if (countryCode == null) {
+            // Invalid ISO supplied:
+            countryCode = DEFAULT_COUNTRY_CODE_INT;
+            providedCountryIso = DEFAULT_COUNTRY_CODE;
+        }
+
+        // National number shouldn't include '+', but just in case:
+        providedNationalNumber = stripPlusSign(providedNationalNumber);
+
+        return new PhoneNumber(
+                providedNationalNumber, providedCountryIso, String.valueOf(countryCode));
+    }
+
     private static String countryIsoForCountryCode(String countryCode) {
         final List<String> countries = CountryCodeToRegionCodeMap.get(Integer.valueOf(countryCode));
         if (countries != null) {
@@ -1337,6 +1353,10 @@ private static String stripCountryCode(String phoneNumber, String countryCode) {
         return phoneNumber.replaceFirst("^\\+?" + countryCode, "");
     }
 
+    private static String stripPlusSign(String phoneNumber) {
+        return phoneNumber.replaceFirst("^\\+?", "");
+    }
+
     private static Locale getSimBasedLocale(@NonNull Context context) {
         final TelephonyManager tm =
                 (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);

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

@@ -74,9 +74,10 @@ private enum VerificationState {
     private PhoneAuthProvider.ForceResendingToken mForceResendingToken;
     private VerificationState mVerificationState;
 
-    public static Intent createIntent(Context context, FlowParameters flowParams, String phone) {
-        return HelperActivityBase.createBaseIntent(context, PhoneVerificationActivity.class, flowParams)
-                .putExtra(ExtraConstants.EXTRA_PHONE, phone);
+    public static Intent createIntent(Context context, FlowParameters flowParams, Bundle params) {
+        return HelperActivityBase.createBaseIntent(
+                context, PhoneVerificationActivity.class, flowParams)
+                .putExtra(ExtraConstants.EXTRA_PARAMS, params);
     }
 
     @Override
@@ -88,15 +89,16 @@ protected void onCreate(final Bundle savedInstance) {
         mVerificationState = VerificationState.VERIFICATION_NOT_STARTED;
         if (savedInstance != null && !savedInstance.isEmpty()) {
             mPhoneNumber = savedInstance.getString(KEY_VERIFICATION_PHONE);
+
             if (savedInstance.getSerializable(KEY_STATE) != null) {
                 mVerificationState = (VerificationState) savedInstance.getSerializable(KEY_STATE);
             }
             return;
         }
 
-        String phone = getIntent().getExtras().getString(ExtraConstants.EXTRA_PHONE);
+        Bundle params = getIntent().getExtras().getBundle(ExtraConstants.EXTRA_PARAMS);
         VerifyPhoneNumberFragment fragment = VerifyPhoneNumberFragment.newInstance
-                (getFlowParams(), phone);
+                (getFlowParams(), params);
         getSupportFragmentManager().beginTransaction()
                 .replace(R.id.fragment_verify_phone, fragment, VerifyPhoneNumberFragment.TAG)
                 .disallowAddToBackStack()
@@ -156,7 +158,18 @@ void verifyPhoneNumber(String phoneNumber, boolean forceResend) {
         }
     }
 
-    public void submitConfirmationCode(String confirmationCode) {
+    public void submitConfirmationCode(@NonNull String confirmationCode) {
+        if (TextUtils.isEmpty(mVerificationId) || TextUtils.isEmpty(confirmationCode)) {
+            // This situation should never happen except in the case of an extreme race
+            // condition, so we will just ignore the submission.
+            // See: https://github.com/firebase/FirebaseUI-Android/issues/922
+            Log.w(PHONE_VERIFICATION_LOG_TAG,
+                    String.format("submitConfirmationCode: mVerificationId is %s ; " +
+                            "confirmationCode is %s", TextUtils.isEmpty(mVerificationId) ? "empty" : "not empty",
+                            TextUtils.isEmpty(confirmationCode) ? "empty" : "not empty"));
+            return;
+        }
+
         showLoadingDialog(getString(R.string.fui_verifying));
         signIn(PhoneAuthProvider.getCredential(mVerificationId, confirmationCode));
     }