Support old way to enable persistent for PersistentCacheManager

Author: cherylEnkidu

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/IndexingTest.java

@@ -15,8 +15,7 @@
 package com.google.firebase.firestore;
 
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testFirestore;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import com.google.android.gms.tasks.Task;
@@ -105,19 +104,33 @@ public void testBadIndexDoesNotCrashClient() {
   }
 
   @Test
-  public void testAutomaticIndexingSetSuccessfully()
-      throws ExecutionException, InterruptedException {
+  public void testAutomaticIndexingSetSuccessfully() {
     // Use persistent disk cache (default)
     FirebaseFirestore db = testFirestore();
     FirebaseFirestoreSettings settings =
         new FirebaseFirestoreSettings.Builder(db.getFirestoreSettings())
-            // Use persistent disk cache (default)
             .setLocalCacheSettings(PersistentCacheSettings.newBuilder().build())
             .build();
     db.setFirestoreSettings(settings);
-    Tasks.await(db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(true));
-    assertTrue(db.getClient().getLocalStore().getQueryEngine().getAutomaticIndexingEnabled());
-    Tasks.await(db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(false));
-    assertFalse(db.getClient().getLocalStore().getQueryEngine().getAutomaticIndexingEnabled());
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(true));
+    assertDoesNotThrow(
+        () -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(false));
+  }
+
+  @Test
+  public void testAutomaticIndexingSetSuccessfullyUseDefault() {
+    // Use persistent disk cache (default)
+    FirebaseFirestore db = testFirestore();
+    assertDoesNotThrow(() -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(true));
+    assertDoesNotThrow(
+        () -> db.getPersistentCacheIndexManager().setAutomaticIndexingEnabled(false));
+  }
+
+  public void assertDoesNotThrow(Runnable block) {
+    try {
+      block.run();
+    } catch (Exception e) {
+      fail("Should not have thrown " + e);
+    }
   }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/FirebaseFirestore.java

@@ -410,7 +410,8 @@ public PersistentCacheManager getPersistentCacheIndexManager() {
     if (persistentCacheManager != null) {
       return persistentCacheManager;
     }
-    if (settings.getCacheSettings() instanceof PersistentCacheSettings) {
+    if (settings.isPersistenceEnabled()
+        || settings.getCacheSettings() instanceof PersistentCacheSettings) {
       persistentCacheManager = new PersistentCacheManager(client);
     }
     return persistentCacheManager;

firebase-firestore/src/main/java/com/google/firebase/firestore/PersistentCacheManager.java

@@ -2,7 +2,6 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.RestrictTo;
-import com.google.android.gms.tasks.Task;
 import com.google.firebase.firestore.core.FirestoreClient;
 
 // TODO(csi): Remove the `hide` and scope annotations.
@@ -16,7 +15,7 @@ public PersistentCacheManager(FirestoreClient client) {
     this.client = client;
   }
 
-  public Task<Void> setAutomaticIndexingEnabled(boolean isEnabled) {
-    return client.setAutomaticIndexingEnabled(isEnabled);
+  public void setAutomaticIndexingEnabled(boolean isEnabled) {
+    client.setAutomaticIndexingEnabled(isEnabled);
   }
 }

firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java

@@ -19,7 +19,6 @@
 import android.annotation.SuppressLint;
 import android.content.Context;
 import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.tasks.TaskCompletionSource;
 import com.google.android.gms.tasks.Tasks;
@@ -140,11 +139,6 @@ public FirestoreClient(
         });
   }
 
-  @RestrictTo(RestrictTo.Scope.LIBRARY)
-  public LocalStore getLocalStore() {
-    return localStore;
-  }
-
   public Task<Void> disableNetwork() {
     this.verifyNotTerminated();
     return asyncQueue.enqueue(() -> remoteStore.disableNetwork());
@@ -359,9 +353,9 @@ public Task<Void> configureFieldIndexes(List<FieldIndex> fieldIndices) {
     return asyncQueue.enqueue(() -> localStore.configureFieldIndexes(fieldIndices));
   }
 
-  public Task<Void> setAutomaticIndexingEnabled(boolean isEnabled) {
+  public void setAutomaticIndexingEnabled(boolean isEnabled) {
     verifyNotTerminated();
-    return asyncQueue.enqueue(() -> localStore.setAutomaticIndexingEnabled(isEnabled));
+    asyncQueue.enqueue(() -> localStore.setAutomaticIndexingEnabled(isEnabled));
   }
 
   public void removeSnapshotsInSyncListener(EventListener<Void> listener) {

firebase-firestore/src/main/java/com/google/firebase/firestore/local/LocalStore.java

@@ -21,7 +21,6 @@
 import android.util.SparseArray;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 import androidx.annotation.VisibleForTesting;
 import com.google.firebase.Timestamp;
 import com.google.firebase.database.collection.ImmutableSortedMap;
@@ -201,11 +200,6 @@ public LocalDocumentsView getLocalDocumentsForCurrentUser() {
     return localDocuments;
   }
 
-  @RestrictTo(RestrictTo.Scope.LIBRARY)
-  public QueryEngine getQueryEngine() {
-    return queryEngine;
-  }
-
   // PORTING NOTE: no shutdown for LocalStore or persistence components on Android.
 
   public ImmutableSortedMap<DocumentKey, Document> handleUserChange(User user) {