Merge branch 'master' into version-4.3.0-dev

samtstern · samtstern · commit a9469ba2a1fa · 2018-10-24T15:23:48.000+01:00
diff --git a/README.md b/README.md
@@ -50,19 +50,19 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:4.2.0'
+    implementation 'com.firebaseui:firebase-ui-database:4.2.1'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:4.2.0'
+    implementation 'com.firebaseui:firebase-ui-firestore:4.2.1'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:4.2.0'
+    implementation 'com.firebaseui:firebase-ui-auth:4.2.1'
 
     // FirebaseUI for Firebase Auth (GitHub provider)
-    implementation 'com.firebaseui:firebase-ui-auth-github:4.2.0'
+    implementation 'com.firebaseui:firebase-ui-auth-github:4.2.1'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:4.2.0'
+    implementation 'com.firebaseui:firebase-ui-storage:4.2.1'
 }
 ```
 
@@ -105,15 +105,15 @@ versions. This means that FirebaseUI has independent dependencies on each of the
 For best results, your app should depend on a version of each dependency with the same major
 version number as the version used by FirebaseUI.
 
-As of version `4.2.0`, FirebaseUI has the following dependency versions:
+As of version `4.2.1`, FirebaseUI has the following dependency versions:
 
 | Library              | Version                        |
 |----------------------|--------------------------------|
-| `firebase-auth`      | 16.0.3                         |
-| `play-services-auth` | 16.0.0                         |
-| `firebase-database`  | 16.0.2                         |
-| `firebase-firestore` | 17.1.0                         |
-| `firebase-storage`   | 16.0.2                         |
+| `firebase-auth`      | 16.0.5                         |
+| `play-services-auth` | 16.0.1                         |
+| `firebase-database`  | 16.0.3                         |
+| `firebase-firestore` | 17.1.1                         |
+| `firebase-storage`   | 16.0.3                         |
 
 ### Upgrading dependencies
 
diff --git a/auth-github/build.gradle.kts b/auth-github/build.gradle.kts
@@ -1,3 +1,9 @@
+android {
+    lintOptions {
+        disable("UnknownNullness") // TODO fix in future PR
+    }
+}
+
 dependencies {
     compileOnly(project(":auth")) { isTransitive = false }
     compileOnly(Config.Libs.Firebase.auth) { isTransitive = false }
diff --git a/auth/README.md b/auth/README.md
@@ -65,10 +65,10 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:4.2.0'
+    implementation 'com.firebaseui:firebase-ui-auth:4.2.1'
 
     // Required only if GitHub OAuth support is required
-    implementation 'com.firebaseui:firebase-ui-auth-github:4.2.0'
+    implementation 'com.firebaseui:firebase-ui-auth-github:4.2.1'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://goo.gl/Ce5L94
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListAdapter.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListAdapter.java
@@ -34,8 +34,13 @@
  * Array adapter used to display a list of countries with section indices.
  */
 final class CountryListAdapter extends ArrayAdapter<CountryInfo> implements SectionIndexer {
+
+    // Map from first letter --> position in the list
     private final HashMap<String, Integer> alphaIndex = new LinkedHashMap<>();
+
+    // Map from display name --> position in the list
     private final HashMap<String, Integer> countryPosition = new LinkedHashMap<>();
+
     private String[] sections;
 
     public CountryListAdapter(Context context) {
@@ -67,6 +72,11 @@ public void setData(List<CountryInfo> countries) {
         notifyDataSetChanged();
     }
 
+    @Override
+    public int getCount() {
+        return countryPosition.size();
+    }
+
     @Override
     public Object[] getSections() {
         return sections;
@@ -92,6 +102,16 @@ public int getPositionForSection(int index) {
 
     @Override
     public int getSectionForPosition(int position) {
+        if (sections == null) {
+            return 0;
+        }
+
+        for (int i = 0; i < sections.length; i++) {
+            if (getPositionForSection(i) > position) {
+                return i - 1;
+            }
+        }
+
         return 0;
     }
 
diff --git a/auth/src/main/res/drawable-v21/fui_idp_button_background_anonymous.xml b/auth/src/main/res/drawable-v21/fui_idp_button_background_anonymous.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <corners android:radius="3dp" />
+            <solid android:color="@color/fui_bgAnonymous" />
+        </shape>
+    </item>
+</layer-list>
diff --git a/auth/src/main/res/drawable/fui_ic_anonymous_white_24dp.xml b/auth/src/main/res/drawable/fui_ic_anonymous_white_24dp.xml
@@ -1,12 +1,10 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:width="24dp"
     android:height="24dp"
     android:viewportHeight="24.0"
-    android:viewportWidth="24.0"
-    tools:ignore="InvalidVectorPath">
+    android:viewportWidth="24.0">
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M12 5.9c1.16 0 2.1.94 2.1 2.1s-0.94 2.1-2.1 2.1S9.9 9.16 9.9 8s0.94-2.1 2.1-2.1m0 9c2.97 0 6.1 1.46 6.1 2.1v1.1H5.9V17c0-0.64 3.13-2.1 6.1-2.1M12 4C9.79 4 8 5.79 8 8s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 9c-2.67 0-8 1.34-8 4v3h16v-3c0-2.66-5.33-4-8-4z" />
+        android:pathData="M12,5.9c1.16,0 2.1,0.94 2.1,2.1s-0.94,2.1 -2.1,2.1S9.9,9.16 9.9,8s0.94,-2.1 2.1,-2.1m0,9c2.97,0 6.1,1.46 6.1,2.1v1.1L5.9,18.1L5.9,17c0,-0.64 3.13,-2.1 6.1,-2.1M12,4C9.79,4 8,5.79 8,8s1.79,4 4,4 4,-1.79 4,-4 -1.79,-4 -4,-4zM12,13c-2.67,0 -8,1.34 -8,4v3h16v-3c0,-2.66 -5.33,-4 -8,-4z" />
 </vector>
diff --git a/auth/src/main/res/layout/fui_welcome_back_password_prompt_layout.xml b/auth/src/main/res/layout/fui_welcome_back_password_prompt_layout.xml
@@ -59,8 +59,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/fui_field_padding_vert"
                 android:text="@string/fui_trouble_signing_in"
-                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toStartOf="@+id/button_done"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/password_layout" />
 
             <Button
@@ -75,7 +75,8 @@
                 android:id="@+id/email_footer_tos_and_pp_text"
                 style="@style/FirebaseUI.PrivacyFooter"
                 app:layout_constraintTop_toBottomOf="@+id/button_done"
-                app:layout_constraintBottom_toBottomOf="parent" />
+                app:layout_constraintBottom_toBottomOf="parent"
+                tools:text="Terms of Service and Privacy Policy" />
 
         </android.support.constraint.ConstraintLayout>
 
diff --git a/auth/src/main/res/values/dimens.xml b/auth/src/main/res/values/dimens.xml
@@ -13,4 +13,6 @@
     <dimen name="fui_button_inset_bottom">3dp</dimen>
     <dimen name="fui_button_inset_left">1dp</dimen>
     <dimen name="fui_button_inset_right">2dp</dimen>
+
+    <dimen name="fui_min_height_target">48dp</dimen>
 </resources>
diff --git a/auth/src/main/res/values/styles.xml b/auth/src/main/res/values/styles.xml
@@ -146,6 +146,8 @@
     </style>
 
     <style name="FirebaseUI.Text.Link">
+        <item name="android:minHeight">@dimen/fui_min_height_target</item>
+        <item name="android:gravity">center_vertical</item>
         <item name="android:textColor">@color/fui_linkColor</item>
     </style>
 
@@ -256,7 +258,8 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_marginTop">@dimen/fui_field_padding_vert</item>
         <item name="android:layout_marginBottom">@dimen/fui_field_padding_vert</item>
-        <item name="android:gravity">end</item>
+        <item name="android:minHeight">@dimen/fui_min_height_target</item>
+        <item name="android:gravity">end|center_vertical</item>
         <item name="android:textIsSelectable">false</item>
     </style>
 
diff --git a/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java b/auth/src/test/java/com/firebase/ui/auth/testhelpers/TestHelper.java
@@ -16,6 +16,7 @@
 
 import android.content.Context;
 import android.content.res.Resources;
+import android.util.Log;
 
 import com.firebase.ui.auth.AuthUI;
 import com.firebase.ui.auth.AuthUI.IdpConfig;
@@ -35,6 +36,7 @@
 
 import org.robolectric.RuntimeEnvironment;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -46,13 +48,17 @@
 import static org.mockito.Mockito.when;
 
 public final class TestHelper {
+
+    private static final String TAG = "TestHelper";
+    private static final String DEFAULT_APP_NAME = "[DEFAULT]";
+
     public static final FirebaseApp MOCK_APP;
 
     static {
         FirebaseApp app = mock(FirebaseApp.class);
         when(app.get(eq(FirebaseAuth.class))).thenReturn(mock(FirebaseAuth.class));
         when(app.getApplicationContext()).thenReturn(RuntimeEnvironment.application);
-        when(app.getName()).thenReturn(FirebaseApp.DEFAULT_APP_NAME);
+        when(app.getName()).thenReturn(DEFAULT_APP_NAME);
         MOCK_APP = app;
     }
 
@@ -141,7 +147,7 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds,
             }
         }
         return new FlowParameters(
-                FirebaseApp.DEFAULT_APP_NAME,
+                DEFAULT_APP_NAME,
                 idpConfigs,
                 AuthUI.getDefaultTheme(),
                 AuthUI.NO_LOGO,
@@ -154,5 +160,40 @@ public static FlowParameters getFlowParameters(Collection<String> providerIds,
                 null);
     }
 
+    /**
+     * Set a private, obfuscated field of an object.
+     * @param obj the object to modify.
+     * @param objClass the object's class.
+     * @param fieldClass the class of the target field.
+     * @param fieldValue the value to use for the field.
+     */
+    public static <T, F> void setPrivateField(
+            T obj,
+            Class<T> objClass,
+            Class<F> fieldClass,
+            F fieldValue) {
+
+        Field targetField = null;
+        Field[] classFields = objClass.getDeclaredFields();
+        for (Field field : classFields) {
+            if (field.getType().equals(fieldClass)) {
+                if (targetField != null) {
+                    throw new IllegalStateException("Class " + objClass + " has multiple fields of type " + fieldClass);
+                }
+
+                targetField = field;
+            }
+        }
+
+        if (targetField == null) {
+            throw new IllegalStateException("Class " + objClass + " has no fields of type " + fieldClass);
+        }
 
+        targetField.setAccessible(true);
+        try {
+            targetField.set(obj, fieldValue);
+        } catch (IllegalAccessException e) {
+            Log.w(TAG, "Error setting field", e);
+        }
+    }
 }
diff --git a/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java b/auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java
@@ -14,6 +14,7 @@
 import com.firebase.ui.auth.testhelpers.TestConstants;
 import com.firebase.ui.auth.testhelpers.TestHelper;
 import com.firebase.ui.auth.viewmodel.phone.PhoneProviderResponseHandler;
+import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.AuthResult;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseAuthUserCollisionException;
@@ -104,9 +105,13 @@ public void testSignIn_autoUpgradeAnonymousEnabledWithExistingUser_expectMergeFa
         mHandler.getOperation().observeForever(mResponseObserver);
         setupAnonymousUpgrade();
 
+        FirebaseAuthUserCollisionException ex =
+                new FirebaseAuthUserCollisionException("foo", "bar");
+        TestHelper.setPrivateField(ex, FirebaseAuthUserCollisionException.class,
+                AuthCredential.class, mCredential);
+
         when(mMockAuth.getCurrentUser().linkWithCredential(mCredential))
-                .thenReturn(AutoCompleteTask.<AuthResult>forFailure(
-                        new FirebaseAuthUserCollisionException("foo", "bar", mCredential)));
+                .thenReturn(AutoCompleteTask.<AuthResult>forFailure(ex));
 
         IdpResponse response = new IdpResponse.Builder(new User.Builder(
                 PhoneAuthProvider.PROVIDER_ID, TestConstants.EMAIL).build())
diff --git a/build.gradle b/build.gradle
@@ -0,0 +1,2 @@
+// This empty file along with settings.gradle help Android Studio recognize the project
+// as a gradle project, despite the use of .gradle.kts scripts.
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -11,7 +11,7 @@ object Config {
     }
 
     object Plugins {
-        const val android = "com.android.tools.build:gradle:3.2.0"
+        const val android = "com.android.tools.build:gradle:3.2.1"
         const val kotlin = "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         const val google = "com.google.gms:google-services:4.0.2"
 
@@ -36,7 +36,7 @@ object Config {
             const val cardView = "com.android.support:cardview-v7:$version"
             const val customTabs = "com.android.support:customtabs:$version"
 
-            const val constraint = "com.android.support.constraint:constraint-layout:1.1.2"
+            const val constraint = "com.android.support.constraint:constraint-layout:1.1.3"
         }
 
         object Arch {
@@ -51,15 +51,15 @@ object Config {
         }
 
         object Firebase {
-            const val core = "com.google.firebase:firebase-core:16.0.3"
-            const val auth = "com.google.firebase:firebase-auth:16.0.3"
-            const val firestore = "com.google.firebase:firebase-firestore:17.1.0"
-            const val database = "com.google.firebase:firebase-database:16.0.2"
-            const val storage = "com.google.firebase:firebase-storage:16.0.2"
+            const val core = "com.google.firebase:firebase-core:16.0.4"
+            const val auth = "com.google.firebase:firebase-auth:16.0.5"
+            const val firestore = "com.google.firebase:firebase-firestore:17.1.1"
+            const val database = "com.google.firebase:firebase-database:16.0.3"
+            const val storage = "com.google.firebase:firebase-storage:16.0.3"
         }
 
         object PlayServices {
-            const val auth = "com.google.android.gms:play-services-auth:16.0.0"
+            const val auth = "com.google.android.gms:play-services-auth:16.0.1"
         }
 
 
@@ -106,7 +106,7 @@ object Config {
         }
 
         object Lint {
-            private const val version = "26.2.0-alpha17"
+            private const val version = "26.2.1"
 
             const val api = "com.android.tools.lint:lint-api:$version"
             const val tests = "com.android.tools.lint:lint-tests:$version"
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,5 @@
+rootProject.buildFileName = 'build.gradle.kts'
+
 include(
         ":app", ":library",
 
