Make build pass

Change-Id: Ic3851f7e43a44447c65ff7ea9f721a5a0eda88af

Author: samtstern

firestore/src/main/java/com/firebase/ui/firestore/paging/FirestoreDataSource.java

@@ -51,7 +51,7 @@ public FirestoreDataSource(Query baseQuery) {
     @Override
     public void loadInitial(@NonNull LoadInitialParams<PageKey> params,
                             @NonNull final LoadInitialCallback<PageKey, DocumentSnapshot> callback) {
-        Log.d(TAG, "loadInitial: " + params.requestedLoadSize);
+        logd("loadInitial: " + params.requestedLoadSize);
 
         // Set initial loading state
         mLoadingState.postValue(LoadingState.LOADING_INITIAL);
@@ -101,7 +101,7 @@ public void loadBefore(@NonNull LoadParams<PageKey> params,
     public void loadAfter(@NonNull LoadParams<PageKey> params,
                           @NonNull final LoadCallback<PageKey, DocumentSnapshot> callback) {
         final PageKey key = params.key;
-        Log.d(TAG, "loadAfter: " + key + ", " + params.requestedLoadSize);
+        logd("loadAfter: " + key + ", " + params.requestedLoadSize);
 
         // Set loading state
         mLoadingState.postValue(LoadingState.LOADING_MORE);
@@ -147,4 +147,10 @@ private DocumentSnapshot getLast(List<DocumentSnapshot> data) {
             return data.get(data.size() - 1);
         }
     }
+
+    private static void logd(String message) {
+        if (Log.isLoggable(TAG, Log.DEBUG)) {
+            Log.d(TAG, message);
+        }
+    }
 }

firestore/src/main/java/com/firebase/ui/firestore/paging/FirestorePagingOptions.java

@@ -1,6 +1,7 @@
 package com.firebase.ui.firestore.paging;
 
 import android.arch.lifecycle.LifecycleOwner;
+import android.arch.paging.LivePagedListBuilder;
 import android.arch.paging.PagedList;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
@@ -62,7 +63,7 @@ public Builder<T> setQuery(@NonNull Query query,
 
             // Build paged list
             FirestoreDataSource.Factory factory = new FirestoreDataSource.Factory(query);
-            mData = new PagingData(factory, config);
+            mData = new PagingData(new LivePagedListBuilder<>(factory, config).build());
 
             mParser = parser;
             return this;

firestore/src/main/java/com/firebase/ui/firestore/paging/PagingData.java

@@ -3,7 +3,6 @@
 import android.arch.core.util.Function;
 import android.arch.lifecycle.LiveData;
 import android.arch.lifecycle.Transformations;
-import android.arch.paging.LivePagedListBuilder;
 import android.arch.paging.PagedList;
 import android.support.annotation.NonNull;
 import android.support.annotation.RestrictTo;
@@ -19,10 +18,8 @@ public class PagingData {
     private final LiveData<PagedList<DocumentSnapshot>> mSnapshots;
     private final LiveData<LoadingState> mLoadingState;
 
-    public PagingData(@NonNull FirestoreDataSource.Factory factory,
-                      @NonNull PagedList.Config config) {
-
-        mSnapshots = new LivePagedListBuilder<>(factory, config).build();
+    public PagingData(@NonNull LiveData<PagedList<DocumentSnapshot>> snapshots) {
+        mSnapshots = snapshots;
 
         mLoadingState = Transformations.switchMap(mSnapshots,
                 new Function<PagedList<DocumentSnapshot>, LiveData<LoadingState>>() {