Merge pull request #2030 from firebase/version-8.0.1

sam-gc · web-flow · commit 930af6c55cca · 2022-03-30T11:38:30.000-07:00
Version 8.0.1 release
diff --git a/README.md b/README.md
@@ -48,16 +48,16 @@ libraries.
 ```groovy
 dependencies {
     // FirebaseUI for Firebase Realtime Database
-    implementation 'com.firebaseui:firebase-ui-database:8.0.0'
+    implementation 'com.firebaseui:firebase-ui-database:8.0.1'
 
     // FirebaseUI for Cloud Firestore
-    implementation 'com.firebaseui:firebase-ui-firestore:8.0.0'
+    implementation 'com.firebaseui:firebase-ui-firestore:8.0.1'
 
     // FirebaseUI for Firebase Auth
-    implementation 'com.firebaseui:firebase-ui-auth:8.0.0'
+    implementation 'com.firebaseui:firebase-ui-auth:8.0.1'
 
     // FirebaseUI for Cloud Storage
-    implementation 'com.firebaseui:firebase-ui-storage:8.0.0'
+    implementation 'com.firebaseui:firebase-ui-storage:8.0.1'
 }
 ```
 
diff --git a/auth/README.md b/auth/README.md
@@ -65,7 +65,7 @@ Gradle, add the dependency:
 ```groovy
 dependencies {
     // ...
-    implementation 'com.firebaseui:firebase-ui-auth:8.0.0'
+    implementation 'com.firebaseui:firebase-ui-auth:8.0.1'
 
     // Required only if Facebook login support is required
     // Find the latest Facebook SDK releases here: https://github.com/facebook/facebook-android-sdk/blob/master/CHANGELOG.md
diff --git a/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java b/auth/src/main/java/com/firebase/ui/auth/ui/phone/CountryListSpinner.java
@@ -86,7 +86,7 @@ public CountryListSpinner(Context context, AttributeSet attrs, int defStyle) {
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
                 CountryInfo info = mCountryListAdapter.getItem(position);
                 if (info != null) {
-                    setText(info.toShortString());
+                    setSelectedForCountry(info.getCountryCode(), info.getLocale());
                 }
 
                 onUnfocus();
diff --git a/buildSrc/src/main/kotlin/Config.kt b/buildSrc/src/main/kotlin/Config.kt
@@ -1,5 +1,5 @@
 object Config {
-    const val version = "8.0.0"
+    const val version = "8.0.1"
     val submodules = listOf("auth", "common", "firestore", "database", "storage")
 
     private const val kotlinVersion = "1.3.72"
diff --git a/database/src/main/java/com/firebase/ui/database/paging/DatabasePagingSource.java b/database/src/main/java/com/firebase/ui/database/paging/DatabasePagingSource.java
@@ -88,7 +88,13 @@ public Single<LoadResult<String, DataSnapshot>> loadSingle(@NonNull LoadParams<S
                             details).toException();
                 }
             } catch (ExecutionException e) {
-                throw new Exception(e.getCause());
+                if (e.getCause() instanceof Exception) {
+                    // throw the original Exception
+                    throw (Exception) e.getCause();
+                }
+                // Only throw a new Exception when the original
+                // Throwable cannot be cast to Exception
+                throw new Exception(e);
             }
         }).subscribeOn(Schedulers.io()).onErrorReturn(LoadResult.Error::new);
     }
diff --git a/firestore/src/androidTest/java/com/firebase/ui/firestore/paging/FirestorePagingSourceTest.java b/firestore/src/androidTest/java/com/firebase/ui/firestore/paging/FirestorePagingSourceTest.java
@@ -0,0 +1,124 @@
+package com.firebase.ui.firestore.paging;
+
+import com.google.android.gms.tasks.Tasks;
+import com.google.firebase.firestore.DocumentSnapshot;
+import com.google.firebase.firestore.Query;
+import com.google.firebase.firestore.QuerySnapshot;
+import com.google.firebase.firestore.Source;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import androidx.paging.PagingSource;
+import androidx.paging.PagingSource.LoadParams.Append;
+import androidx.paging.PagingSource.LoadParams.Refresh;
+import androidx.paging.PagingSource.LoadResult.Page;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+@RunWith(AndroidJUnit4.class)
+public class FirestorePagingSourceTest {
+
+    @Mock
+    Query mMockQuery;
+
+    ArrayList<DocumentSnapshot> mMockSnapshots = new ArrayList<>();
+    Exception mMockException = new Exception("Could not load Data");
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        initMockQuery();
+
+        for (int i = 0; i < 2; i++) {
+            mMockSnapshots.add(mock(DocumentSnapshot.class));
+        }
+    }
+
+    @Test
+    public void testLoadInitial_success() {
+        FirestorePagingSource pagingSource = new FirestorePagingSource(mMockQuery, Source.DEFAULT);
+        mockQuerySuccess(mMockSnapshots);
+        Page<PageKey, DocumentSnapshot> expected = new Page<>(mMockSnapshots, null, new PageKey(null, null));
+
+        Refresh<PageKey> refreshRequest = new Refresh<>(null, 2, false);
+        PagingSource.LoadResult<PageKey, DocumentSnapshot> actual =
+                pagingSource.loadSingle(refreshRequest).blockingGet();
+
+        assertTrue(actual instanceof Page);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testLoadInitial_failure() {
+        FirestorePagingSource pagingSource = new FirestorePagingSource(mMockQuery, Source.DEFAULT);
+        mockQueryFailure(mMockException);
+        PagingSource.LoadResult.Error<PageKey, DocumentSnapshot> expected =
+                new PagingSource.LoadResult.Error<>(mMockException);
+
+        Refresh<PageKey> refreshRequest = new Refresh<>(null, 2, false);
+        PagingSource.LoadResult<PageKey, DocumentSnapshot> actual =
+                pagingSource.loadSingle(refreshRequest).blockingGet();
+
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testLoadAfter_success() {
+        FirestorePagingSource pagingSource = new FirestorePagingSource(mMockQuery, Source.DEFAULT);
+        mockQuerySuccess(mMockSnapshots);
+        PageKey pageKey = new PageKey(null, null);
+        Page<PageKey, DocumentSnapshot> expected = new Page<>(mMockSnapshots, null, pageKey);
+
+        Append<PageKey> appendRequest = new Append<>(pageKey, 2, false);
+        PagingSource.LoadResult<PageKey, DocumentSnapshot> actual =
+                pagingSource.loadSingle(appendRequest).blockingGet();
+
+        assertTrue(actual instanceof Page);
+        assertEquals(expected, actual);
+    }
+
+    @Test
+    public void testLoadAfter_failure() {
+        FirestorePagingSource pagingSource = new FirestorePagingSource(mMockQuery, Source.DEFAULT);
+        mockQueryFailure(mMockException);
+        PageKey pageKey = new PageKey(null, null);
+        PagingSource.LoadResult.Error<PageKey, DocumentSnapshot> expected =
+                new PagingSource.LoadResult.Error<>(mMockException);
+
+        Append<PageKey> appendRequest = new Append<>(pageKey, 2, false);
+        PagingSource.LoadResult<PageKey, DocumentSnapshot> actual =
+                pagingSource.loadSingle(appendRequest).blockingGet();
+
+        assertEquals(expected, actual);
+    }
+
+    private void initMockQuery() {
+        when(mMockQuery.startAfter(any(DocumentSnapshot.class))).thenReturn(mMockQuery);
+        when(mMockQuery.endBefore(any(DocumentSnapshot.class))).thenReturn(mMockQuery);
+        when(mMockQuery.limit(anyLong())).thenReturn(mMockQuery);
+    }
+
+    private void mockQuerySuccess(List<DocumentSnapshot> snapshots) {
+        QuerySnapshot mockSnapshot = mock(QuerySnapshot.class);
+        when(mockSnapshot.getDocuments()).thenReturn(snapshots);
+
+        when(mMockQuery.get(Source.DEFAULT)).thenReturn(Tasks.forResult(mockSnapshot));
+    }
+
+    private void mockQueryFailure(Exception exception) {
+        when(mMockQuery.get(Source.DEFAULT)).thenReturn(Tasks.forException(exception));
+    }
+}
diff --git a/firestore/src/main/java/com/firebase/ui/firestore/paging/FirestorePagingSource.java b/firestore/src/main/java/com/firebase/ui/firestore/paging/FirestorePagingSource.java
@@ -8,14 +8,13 @@
 import com.google.firebase.firestore.Source;
 
 import java.util.List;
-import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.paging.PagingState;
 import androidx.paging.rxjava3.RxPagingSource;
 import io.reactivex.rxjava3.core.Single;
-import io.reactivex.rxjava3.functions.Function;
 import io.reactivex.rxjava3.schedulers.Schedulers;
 
 public class FirestorePagingSource extends RxPagingSource<PageKey, DocumentSnapshot> {
@@ -39,18 +38,24 @@ public Single<LoadResult<PageKey, DocumentSnapshot>> loadSingle(@NonNull LoadPar
         }
 
         return Single.fromCallable(() -> {
-            Tasks.await(task);
-            if (task.isSuccessful()) {
+            try {
+                Tasks.await(task);
                 QuerySnapshot snapshot = task.getResult();
                 PageKey nextPage = getNextPageKey(snapshot);
                 if (snapshot.getDocuments().isEmpty()) {
                     return toLoadResult(snapshot.getDocuments(), null);
                 }
                 return toLoadResult(snapshot.getDocuments(), nextPage);
+            } catch (ExecutionException e) {
+                if (e.getCause() instanceof Exception) {
+                    // throw the original Exception
+                    throw (Exception) e.getCause();
+                }
+                // Only throw a new Exception when the original
+                // Throwable cannot be cast to Exception
+                throw new Exception(e);
             }
-            throw task.getException();
-        }).subscribeOn(Schedulers.io())
-                .onErrorReturn(throwable -> new LoadResult.Error<>(throwable));
+        }).subscribeOn(Schedulers.io()).onErrorReturn(LoadResult.Error::new);
     }
 
     private LoadResult<PageKey, DocumentSnapshot> toLoadResult(
diff --git a/firestore/src/main/java/com/firebase/ui/firestore/paging/PageKey.java b/firestore/src/main/java/com/firebase/ui/firestore/paging/PageKey.java
@@ -38,6 +38,19 @@ public Query getPageQuery(@NonNull Query baseQuery, int size) {
         return pageQuery;
     }
 
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        PageKey key = (PageKey) o;
+        if (mStartAfter == null && key.mStartAfter == null)
+            return true;
+        if (mEndBefore == null && key.mEndBefore == null)
+            return true;
+        return mStartAfter.getId() == key.mStartAfter.getId() &&
+                mEndBefore.getId() == key.mEndBefore.getId();
+    }
+
     @Override
     @NonNull
     public String toString() {
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 GROUP=com.firebaseui
-VERSION_NAME=8.0.0
+VERSION_NAME=8.0.1
 
 POM_PACKAGING=aar
 POM_DESCRIPTION=FirebaseUI for Android

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public CountryListSpinner(Context context, AttributeSet attrs, int defStyle) {`
`86`	`86`	`public void onItemClick(AdapterView<?> parent, View view, int position, long id) {`
`87`	`87`	`CountryInfo info = mCountryListAdapter.getItem(position);`
`88`	`88`	`if (info != null) {`
`89`		`- setText(info.toShortString());`
	`89`	`+ setSelectedForCountry(info.getCountryCode(), info.getLocale());`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`onUnfocus();`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,13 @@ public Single<LoadResult<String, DataSnapshot>> loadSingle(@NonNull LoadParams<S`
`88`	`88`	`details).toException();`
`89`	`89`	`}`
`90`	`90`	`} catch (ExecutionException e) {`
`91`		`- throw new Exception(e.getCause());`
	`91`	`+ if (e.getCause() instanceof Exception) {`
	`92`	`+ // throw the original Exception`
	`93`	`+ throw (Exception) e.getCause();`
	`94`	`+ }`
	`95`	`+ // Only throw a new Exception when the original`
	`96`	`+ // Throwable cannot be cast to Exception`
	`97`	`+ throw new Exception(e);`
`92`	`98`	`}`
`93`	`99`	`}).subscribeOn(Schedulers.io()).onErrorReturn(LoadResult.Error::new);`
`94`	`100`	`}`