Merge remote-tracking branch 'upstream/version-4.1.0-dev' into tests

Author: SUPERCILEX

README.md

@@ -47,16 +47,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:4.0.0'
+    implementation 'com.firebaseui:firebase-ui-database:4.0.1'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:4.0.0'
+    implementation 'com.firebaseui:firebase-ui-firestore:4.0.1'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:4.0.0'
+    implementation 'com.firebaseui:firebase-ui-auth:4.0.1'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:4.0.0'
+    implementation 'com.firebaseui:firebase-ui-storage:4.0.1'
 }
 ```
 
@@ -206,7 +206,7 @@ repositories {
 Then you can depend on snapshot versions:
 
 ```groovy
-implementation 'com.firebaseui:firebase-ui-auth:4.0.0-SNAPSHOT'
+implementation 'com.firebaseui:firebase-ui-auth:x.y.z-SNAPSHOT'
 ```
 
 You can see which `SNAPSHOT` builds are avaiable here:

auth/README.md

@@ -63,7 +63,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:4.0.0'
+    implementation 'com.firebaseui:firebase-ui-auth:4.0.1'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94
@@ -291,6 +291,7 @@ startActivityForResult(
 
 ##### Phone number authentication customization
 
+###### Setting a default phone number
 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.
@@ -301,7 +302,7 @@ IdpConfig phoneConfigWithDefaultNumber = new IdpConfig.PhoneBuilder()
         .build();
 ```
 
-Alternatively, you can set only the default phone number country.
+Alternatively, you can set the default country (alpha-2 format) to be shown in the country selector.
 
 ```java
 IdpConfig phoneConfigWithDefaultNumber = new IdpConfig.PhoneBuilder()
@@ -319,6 +320,45 @@ IdpConfig phoneConfigWithDefaultNumber = new IdpConfig.PhoneBuilder()
         .build();
 ```
 
+###### Limiting the list of available countries in the country selector
+
+You can limit the countries shown in the country selector list. By default, all countries are shown. 
+
+You can provide a list of countries to whitelist or blacklist. You can populate these lists with 
+ISO (alpha-2) and E164 formatted country codes. 
+
+```java
+List<String> whitelistedCountries = new ArrayList<String>();
+whitelistedCountries.add("+1");
+whitelistedCountries.add("gr");
+
+IdpConfig phoneConfigWithWhitelistedCountries = new IdpConfig.PhoneBuilder()
+        .setWhitelistedCountries(whitelistedCountries)
+        .build();
+```
+All countries with the country code +1 will be present in the selector as well as Greece ('gr'). 
+
+You may want to exclude a few countries from the list and avoid creating a whitelist with
+many countries. You can instead provide a list of countries to blacklist. By doing so, all countries 
+excluding the ones you provide will be in the selector. 
+
+```java
+List<String> blacklistedCountries = new ArrayList<String>();
+blacklistedCountries.add("+1");
+blacklistedCountries.add("gr");
+
+IdpConfig phoneConfigWithBlacklistedCountries = new IdpConfig.PhoneBuilder()
+        .setBlacklistedCountries(blacklistedCountries)
+        .build();
+```
+
+The country code selector will exclude all countries with a country code of +1 and Greece ('gr'). 
+
+Note: You can't provide both a list of countries to whitelist and blacklist. If you do, a runtime
+exception will be thrown. 
+
+#####
+
 ### Handling the sign-in response
 
 #### Response codes

auth/build.gradle.kts

@@ -11,6 +11,7 @@ android {
 
     lintOptions {
         disable("UnusedQuantity")
+        disable("MissingTranslation") // TODO: Translate fui_auto_verified
     }
 
     testOptions {

auth/src/main/java/com/firebase/ui/auth/data/client/CountryListLoadTask.java

@@ -50,9 +50,9 @@ public interface Listener {
     Set<String> whitelistedCountryIsos;
     Set<String> blacklistedCountryIsos;
 
-    public CountryListLoadTask(Listener listener,
-                               @Nullable List<String> whitelistedCountries,
-                               @Nullable List<String> blacklistedCountries) {
+    public CountryListLoadTask(@Nullable List<String> whitelistedCountries,
+                               @Nullable List<String> blacklistedCountries,
+                               Listener listener) {
         mListener = listener;
 
         if (whitelistedCountries != null) {

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

@@ -148,9 +148,8 @@ public void onClick(View view) {
     }
 
     private void loadCountryList() {
-        new CountryListLoadTask(this,
-                whitelistedCountries,
-                blacklistedCountries).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+        new CountryListLoadTask(whitelistedCountries, blacklistedCountries, this
+        ).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
     }
 
     private void executeUserClickListener(View view) {

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

@@ -79,7 +79,7 @@ protected void onFailure(@NonNull Exception e) {
             protected void onSuccess(@NonNull PhoneVerification verification) {
                 if (verification.isAutoVerified()) {
                     Toast.makeText(
-                            PhoneActivity.this, R.string.fui_verified, Toast.LENGTH_LONG).show();
+                            PhoneActivity.this, R.string.fui_auto_verified, Toast.LENGTH_LONG).show();
                 }
 
                 handler.startSignIn(verification.getCredential(), new IdpResponse.Builder(

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

@@ -49,17 +49,11 @@
     <string name="fui_resend_code_in">إعادة إرسال الرمز بعد 0:%02d</string>
     <string name="fui_verify_your_phone_title">إثبات ملكية رقم هاتفك</string>
     <string name="fui_verifying">جارٍ التحقق…</string>
-    <string name="fui_retrieving_sms">جارٍ استرداد الرسائل القصيرة SMS…</string>
     <string name="fui_incorrect_code_dialog_body">الرمز غير صحيح. يُرجى المحاولة مجددًا.</string>
-    <string name="fui_incorrect_code_dialog_positive_button_text">موافق</string>
     <string name="fui_error_too_many_attempts">تم استخدام رقم الهاتف هذا لعدد كبير جدًا من المرات</string>
     <string name="fui_error_quota_exceeded">حدثت مشكلة أثناء إثبات ملكية رقم هاتفك</string>
     <string name="fui_error_session_expired">لم يعد هذا الرمز صالحًا</string>
     <string name="fui_sign_in_with_phone_number">تسجيل الدخول عبر رقم الهاتف</string>
-    <string name="fui_done">تم</string>
-    <string name="fui_verified">اكتملت عملية إثبات الملكية!</string>
-    <string name="fui_code_sent">تم إرسال الرمز!</string>
-    <string name="fui_resending">جارٍ إعادة الإرسال…</string>
     <string name="fui_resend_code">إعادة إرسال الرمز</string>
     <string name="fui_verify_phone_number">تأكيد ملكية رقم الهاتف</string>
     <string name="fui_continue_phone_login">متابعة</string>

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

@@ -49,17 +49,11 @@
     <string name="fui_resend_code_in">Se reenviará el código en 0:%02d</string>
     <string name="fui_verify_your_phone_title">Verifica tu número de teléfono</string>
     <string name="fui_verifying">Verificando…</string>
-    <string name="fui_retrieving_sms">Recuperando SMS…</string>
     <string name="fui_incorrect_code_dialog_body">Código incorrecto. Vuelve a intentarlo.</string>
-    <string name="fui_incorrect_code_dialog_positive_button_text">Aceptar</string>
     <string name="fui_error_too_many_attempts">Este número de teléfono se usó demasiadas veces</string>
     <string name="fui_error_quota_exceeded">Ocurrió un problema durante la verificación de tu número de teléfono</string>
     <string name="fui_error_session_expired">Este código ya no es válido</string>
     <string name="fui_sign_in_with_phone_number">Acceder con el número de teléfono</string>
-    <string name="fui_done">Listo</string>
-    <string name="fui_verified">¡Verificado!</string>
-    <string name="fui_code_sent">Se envió el código.</string>
-    <string name="fui_resending">Reenviando…</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>

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

@@ -49,17 +49,11 @@
     <string name="fui_resend_code_in">Повторно изпращане на кода след 0:%02d</string>
     <string name="fui_verify_your_phone_title">Потвърждаване на телефонния ви номер</string>
     <string name="fui_verifying">Потвърждава се…</string>
-    <string name="fui_retrieving_sms">SMS съобщението се извлича…</string>
     <string name="fui_incorrect_code_dialog_body">Неправилен код. Опитайте отново.</string>
-    <string name="fui_incorrect_code_dialog_positive_button_text">ОК</string>
     <string name="fui_error_too_many_attempts">Този телефонен номер е използван твърде много пъти</string>
     <string name="fui_error_quota_exceeded">При потвърждаването на телефонния ви номер възникна проблем</string>
     <string name="fui_error_session_expired">Този код вече не е валиден</string>
     <string name="fui_sign_in_with_phone_number">Вход с телефонен номер</string>
-    <string name="fui_done">Готово</string>
-    <string name="fui_verified">Потвърдено!</string>
-    <string name="fui_code_sent">Кодът е изпратен!</string>
-    <string name="fui_resending">Изпраща се повторно…</string>
     <string name="fui_resend_code">Повторно изпращане на кода</string>
     <string name="fui_verify_phone_number">Потвърждаване на телефонния номер</string>
     <string name="fui_continue_phone_login">Напред</string>

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

@@ -49,17 +49,11 @@
     <string name="fui_resend_code_in">0:%02d এ কোডটি আবার পাঠান</string>
     <string name="fui_verify_your_phone_title">আপনার ফোন নম্বর যাচাই করুন</string>
     <string name="fui_verifying">যাচাই করা হচ্ছে…</string>
-    <string name="fui_retrieving_sms">এসএমএসটি পুনরুদ্ধার করা হচ্ছে…</string>
     <string name="fui_incorrect_code_dialog_body">কোডটি ভুল। আবার চেষ্টা করুন।</string>
-    <string name="fui_incorrect_code_dialog_positive_button_text">ঠিক আছে</string>
     <string name="fui_error_too_many_attempts">এই ফোন নম্বরটি অনেকবার ব্যবহার করা হয়েছে</string>
     <string name="fui_error_quota_exceeded">আপনার ফোন নম্বরটি যাচাই করতে সমস্যা হয়েছে</string>
     <string name="fui_error_session_expired">এই কোডটি আর ব্যবহার করা যাবে না</string>
     <string name="fui_sign_in_with_phone_number">ফোন নম্বর দিয়ে সাইন-ইন করুন</string>
-    <string name="fui_done">সম্পন্ন হয়েছে</string>
-    <string name="fui_verified">যাচাই করা হয়েছে!</string>
-    <string name="fui_code_sent">কোডটি পাঠানো হয়েছে!</string>
-    <string name="fui_resending">আবার পাঠানো হচ্ছে…</string>
     <string name="fui_resend_code">কোডটি আবার পাঠান</string>
     <string name="fui_verify_phone_number">ফোন নম্বর যাচাই করুন</string>
     <string name="fui_continue_phone_login">চালিয়ে যান</string>