refactor: update Firebase BoM (26.5.0) and replace singleValueEventListener with Query.get() (#1912)

Author: thatfiredev

auth/src/test/java/com/firebase/ui/auth/viewmodel/GenericIdpSignInHandlerTest.java

@@ -152,7 +152,7 @@ public void testStartSignIn_normalSignInFlowWithRecoverableError_expectFailure()
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zza(EMAIL).zza(credential);
+        collisionException.zza(EMAIL).zzb(credential);
 
         when(mMockAuth.startActivityForSignInWithProvider(any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.<AuthResult>forFailure(collisionException));
@@ -256,7 +256,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableEr
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zza(EMAIL).zza(credential);
+        collisionException.zza(EMAIL).zzb(credential);
         when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
                 any(Activity.class), any(OAuthProvider.class)))
                 .thenReturn(AutoCompleteTask.<AuthResult>forFailure(collisionException));
@@ -300,7 +300,7 @@ public void testStartSignIn_anonymousUpgradeFlowWithConflict_expectRecoverableLi
                 .build();
         FirebaseAuthUserCollisionException collisionException
                 = new FirebaseAuthUserCollisionException("foo", "bar");
-        collisionException.zza(EMAIL).zza(credential);
+        collisionException.zza(EMAIL).zzb(credential);
 
         when(mMockAuth.getCurrentUser().startActivityForLinkWithProvider(
                 any(Activity.class), any(OAuthProvider.class)))

auth/src/test/java/com/firebase/ui/auth/viewmodel/PhoneProviderResponseHandlerTest.java

@@ -49,7 +49,7 @@ public class PhoneProviderResponseHandlerTest {
 
     @Mock FirebaseAuth mMockAuth;
     @Mock FirebaseUser mMockUser;
-    @Mock PhoneAuthCredential mCredential;
+    PhoneAuthCredential mCredential;
     @Mock Observer<Resource<IdpResponse>> mResponseObserver;
 
     private PhoneProviderResponseHandler mHandler;
@@ -58,6 +58,7 @@ public class PhoneProviderResponseHandlerTest {
     public void setUp() {
         TestHelper.initialize();
         MockitoAnnotations.initMocks(this);
+        mCredential = PhoneAuthCredential.zzb("sessionInfo", "SmsCode");
 
         mHandler = new PhoneProviderResponseHandler((Application) ApplicationProvider.getApplicationContext());
         FlowParameters testParams = TestHelper.getFlowParameters(Collections.singletonList(

buildSrc/src/main/kotlin/Config.kt

@@ -44,7 +44,7 @@ object Config {
         }
 
         object Firebase {
-            const val bom = "com.google.firebase:firebase-bom:26.0.0"
+            const val bom = "com.google.firebase:firebase-bom:26.5.0"
             const val auth = "com.google.firebase:firebase-auth"
             const val database = "com.google.firebase:firebase-database"
             const val firestore = "com.google.firebase:firebase-firestore"

database/src/main/java/com/firebase/ui/database/paging/FirebaseDataSource.java

@@ -3,10 +3,11 @@
 import android.annotation.SuppressLint;
 import android.util.Log;
 
+import com.google.android.gms.tasks.OnFailureListener;
+import com.google.android.gms.tasks.OnSuccessListener;
 import com.google.firebase.database.DataSnapshot;
 import com.google.firebase.database.DatabaseError;
 import com.google.firebase.database.Query;
-import com.google.firebase.database.ValueEventListener;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -69,9 +70,9 @@ public void loadInitial(@NonNull final LoadInitialParams<String> params,
         mLoadingState.postValue(LoadingState.LOADING_INITIAL);
 
         Query mInitQuery = mQuery.limitToFirst(params.requestedLoadSize);
-        mInitQuery.addListenerForSingleValueEvent(new ValueEventListener() {
+        mInitQuery.get().addOnSuccessListener(new OnSuccessListener<DataSnapshot>() {
             @Override
-            public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
+            public void onSuccess(DataSnapshot dataSnapshot) {
                 if (dataSnapshot.exists()) {
 
                     //Make List of DataSnapshot
@@ -95,11 +96,11 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                     setDatabaseNotFoundError();
                 }
             }
-
+        }).addOnFailureListener(new OnFailureListener() {
             @Override
-            public void onCancelled(@NonNull DatabaseError databaseError) {
+            public void onFailure(@NonNull Exception e) {
                 mRetryRunnable = getRetryLoadInitial(params, callback);
-                setError(databaseError);
+                setError(e);
             }
         });
     }
@@ -118,9 +119,9 @@ public void loadAfter(@NonNull final LoadParams<String> params,
 
         //Load params.requestedLoadSize+1 because, first data item is getting ignored.
         Query mNewQuery = mQuery.startAt(null, params.key).limitToFirst(params.requestedLoadSize + 1);
-        mNewQuery.addListenerForSingleValueEvent(new ValueEventListener() {
+        mNewQuery.get().addOnSuccessListener(new OnSuccessListener<DataSnapshot>() {
             @Override
-            public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
+            public void onSuccess(DataSnapshot dataSnapshot) {
                 if (dataSnapshot.exists()) {
 
                     //Make List of DataSnapshot
@@ -157,13 +158,12 @@ public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
                     mRetryRunnable = getRetryLoadAfter(params, callback);
                     setDatabaseNotFoundError();
                 }
-
             }
-
+        }).addOnFailureListener(new OnFailureListener() {
             @Override
-            public void onCancelled(@NonNull DatabaseError databaseError) {
+            public void onFailure(@NonNull Exception e) {
                 mRetryRunnable = getRetryLoadAfter(params, callback);
-                setError(databaseError);
+                setError(e);
             }
         });
     }
@@ -229,8 +229,8 @@ private void setDatabaseNotFoundError(){
         mLoadingState.postValue(LoadingState.ERROR);
     }
 
-    private void setError(DatabaseError databaseError){
-        mError.postValue(databaseError);
+    private void setError(Exception e){
+        mError.postValue(DatabaseError.fromException(e));
         mLoadingState.postValue(LoadingState.ERROR);
     }