@react-native-firebase/firestore 20.3.0 → 20.5.0

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreCollectionModule.java

@@ -53,6 +53,7 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
   @ReactMethod
   public void namedQueryOnSnapshot(
       String appName,
+      String databaseId,
       String queryName,
       String type,
       ReadableArray filters,
@@ -64,7 +65,7 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
       return;
     }
 
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     firebaseFirestore
         .getNamedQuery(queryName)
         .addOnCompleteListener(
@@ -72,15 +73,16 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
               if (task.isSuccessful()) {
                 Query query = task.getResult();
                 if (query == null) {
-                  sendOnSnapshotError(appName, listenerId, new NullPointerException());
+                  sendOnSnapshotError(appName, databaseId, listenerId, new NullPointerException());
                 } else {
                   ReactNativeFirebaseFirestoreQuery firestoreQuery =
                       new ReactNativeFirebaseFirestoreQuery(
-                          appName, query, filters, orders, options);
-                  handleQueryOnSnapshot(firestoreQuery, appName, listenerId, listenerOptions);
+                          appName, databaseId, query, filters, orders, options);
+                  handleQueryOnSnapshot(
+                      firestoreQuery, appName, databaseId, listenerId, listenerOptions);
                 }
               } else {
-                sendOnSnapshotError(appName, listenerId, task.getException());
+                sendOnSnapshotError(appName, databaseId, listenerId, task.getException());
               }
             });
   }
@@ -88,6 +90,7 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
   @ReactMethod
   public void collectionOnSnapshot(
       String appName,
+      String databaseId,
       String path,
       String type,
       ReadableArray filters,
@@ -99,16 +102,21 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
       return;
     }
 
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     ReactNativeFirebaseFirestoreQuery firestoreQuery =
         new ReactNativeFirebaseFirestoreQuery(
-            appName, getQueryForFirestore(firebaseFirestore, path, type), filters, orders, options);
-
-    handleQueryOnSnapshot(firestoreQuery, appName, listenerId, listenerOptions);
+            appName,
+            databaseId,
+            getQueryForFirestore(firebaseFirestore, path, type),
+            filters,
+            orders,
+            options);
+
+    handleQueryOnSnapshot(firestoreQuery, appName, databaseId, listenerId, listenerOptions);
   }
 
   @ReactMethod
-  public void collectionOffSnapshot(String appName, int listenerId) {
+  public void collectionOffSnapshot(String appName, String databaseId, int listenerId) {
     ListenerRegistration listenerRegistration = collectionSnapshotListeners.get(listenerId);
     if (listenerRegistration != null) {
       listenerRegistration.remove();
@@ -120,6 +128,7 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
   @ReactMethod
   public void namedQueryGet(
       String appName,
+      String databaseId,
       String queryName,
       String type,
       ReadableArray filters,
@@ -127,7 +136,7 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
       ReadableMap options,
       ReadableMap getOptions,
       Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     firebaseFirestore
         .getNamedQuery(queryName)
         .addOnCompleteListener(
@@ -139,7 +148,7 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
                 } else {
                   ReactNativeFirebaseFirestoreQuery firestoreQuery =
                       new ReactNativeFirebaseFirestoreQuery(
-                          appName, query, filters, orders, options);
+                          appName, databaseId, query, filters, orders, options);
                   handleQueryGet(firestoreQuery, getSource(getOptions), promise);
                 }
               } else {
@@ -151,16 +160,22 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
   @ReactMethod
   public void collectionCount(
       String appName,
+      String databaseId,
       String path,
       String type,
       ReadableArray filters,
       ReadableArray orders,
       ReadableMap options,
       Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     ReactNativeFirebaseFirestoreQuery firestoreQuery =
         new ReactNativeFirebaseFirestoreQuery(
-            appName, getQueryForFirestore(firebaseFirestore, path, type), filters, orders, options);
+            appName,
+            databaseId,
+            getQueryForFirestore(firebaseFirestore, path, type),
+            filters,
+            orders,
+            options);
 
     AggregateQuery aggregateQuery = firestoreQuery.query.count();
 
@@ -181,6 +196,7 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
   @ReactMethod
   public void collectionGet(
       String appName,
+      String databaseId,
       String path,
       String type,
       ReadableArray filters,
@@ -188,16 +204,22 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
       ReadableMap options,
       ReadableMap getOptions,
       Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     ReactNativeFirebaseFirestoreQuery firestoreQuery =
         new ReactNativeFirebaseFirestoreQuery(
-            appName, getQueryForFirestore(firebaseFirestore, path, type), filters, orders, options);
+            appName,
+            databaseId,
+            getQueryForFirestore(firebaseFirestore, path, type),
+            filters,
+            orders,
+            options);
     handleQueryGet(firestoreQuery, getSource(getOptions), promise);
   }
 
   private void handleQueryOnSnapshot(
       ReactNativeFirebaseFirestoreQuery firestoreQuery,
       String appName,
+      String databaseId,
       int listenerId,
       ReadableMap listenerOptions) {
     MetadataChanges metadataChanges;
@@ -218,9 +240,9 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
               listenerRegistration.remove();
               collectionSnapshotListeners.remove(listenerId);
             }
-            sendOnSnapshotError(appName, listenerId, exception);
+            sendOnSnapshotError(appName, databaseId, listenerId, exception);
           } else {
-            sendOnSnapshotEvent(appName, listenerId, querySnapshot, metadataChanges);
+            sendOnSnapshotEvent(appName, databaseId, listenerId, querySnapshot, metadataChanges);
           }
         };
 
@@ -246,12 +268,15 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
 
   private void sendOnSnapshotEvent(
       String appName,
+      String databaseId,
       int listenerId,
       QuerySnapshot querySnapshot,
       MetadataChanges metadataChanges) {
     Tasks.call(
             getTransactionalExecutor(Integer.toString(listenerId)),
-            () -> snapshotToWritableMap(appName, "onSnapshot", querySnapshot, metadataChanges))
+            () ->
+                snapshotToWritableMap(
+                    appName, databaseId, "onSnapshot", querySnapshot, metadataChanges))
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -266,14 +291,16 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
                         ReactNativeFirebaseFirestoreEvent.COLLECTION_EVENT_SYNC,
                         body,
                         appName,
+                        databaseId,
                         listenerId));
               } else {
-                sendOnSnapshotError(appName, listenerId, task.getException());
+                sendOnSnapshotError(appName, databaseId, listenerId, task.getException());
               }
             });
   }
 
-  private void sendOnSnapshotError(String appName, int listenerId, Exception exception) {
+  private void sendOnSnapshotError(
+      String appName, String databaseId, int listenerId, Exception exception) {
     WritableMap body = Arguments.createMap();
     WritableMap error = Arguments.createMap();
 
@@ -293,7 +320,11 @@ public class ReactNativeFirebaseFirestoreCollectionModule extends ReactNativeFir
 
     emitter.sendEvent(
         new ReactNativeFirebaseFirestoreEvent(
-            ReactNativeFirebaseFirestoreEvent.COLLECTION_EVENT_SYNC, body, appName, listenerId));
+            ReactNativeFirebaseFirestoreEvent.COLLECTION_EVENT_SYNC,
+            body,
+            appName,
+            databaseId,
+            listenerId));
   }
 
   private Source getSource(ReadableMap getOptions) {

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreCommon.java

@@ -19,6 +19,7 @@ package io.invertase.firebase.firestore;
 
 import static io.invertase.firebase.common.ReactNativeFirebaseModule.rejectPromiseWithCodeAndMessage;
 import static io.invertase.firebase.common.ReactNativeFirebaseModule.rejectPromiseWithExceptionMap;
+import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.createFirestoreKey;
 
 import com.facebook.react.bridge.Promise;
 import com.google.firebase.firestore.DocumentSnapshot;
@@ -48,10 +49,12 @@ class ReactNativeFirebaseFirestoreCommon {
     }
   }
 
-  static DocumentSnapshot.ServerTimestampBehavior getServerTimestampBehavior(String appName) {
+  static DocumentSnapshot.ServerTimestampBehavior getServerTimestampBehavior(
+      String appName, String databaseId) {
+    String firestoreKey = createFirestoreKey(appName, databaseId);
     UniversalFirebasePreferences preferences = UniversalFirebasePreferences.getSharedInstance();
     String key =
-        UniversalFirebaseFirestoreStatics.FIRESTORE_SERVER_TIMESTAMP_BEHAVIOR + "_" + appName;
+        UniversalFirebaseFirestoreStatics.FIRESTORE_SERVER_TIMESTAMP_BEHAVIOR + "_" + firestoreKey;
     String behavior = preferences.getStringValue(key, "none");
 
     if ("estimate".equals(behavior)) {

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreDocumentModule.java

@@ -56,12 +56,12 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
 
   @ReactMethod
   public void documentOnSnapshot(
-      String appName, String path, int listenerId, ReadableMap listenerOptions) {
+      String appName, String databaseId, String path, int listenerId, ReadableMap listenerOptions) {
     if (documentSnapshotListeners.get(listenerId) != null) {
       return;
     }
 
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
 
     final EventListener<DocumentSnapshot> listener =
@@ -72,9 +72,9 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
               listenerRegistration.remove();
               documentSnapshotListeners.remove(listenerId);
             }
-            sendOnSnapshotError(appName, listenerId, exception);
+            sendOnSnapshotError(appName, databaseId, listenerId, exception);
           } else {
-            sendOnSnapshotEvent(appName, listenerId, documentSnapshot);
+            sendOnSnapshotEvent(appName, databaseId, listenerId, documentSnapshot);
           }
         };
 
@@ -95,7 +95,7 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
   }
 
   @ReactMethod
-  public void documentOffSnapshot(String appName, int listenerId) {
+  public void documentOffSnapshot(String appName, String databaseId, int listenerId) {
     ListenerRegistration listenerRegistration = documentSnapshotListeners.get(listenerId);
     if (listenerRegistration != null) {
       listenerRegistration.remove();
@@ -104,8 +104,9 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
   }
 
   @ReactMethod
-  public void documentGet(String appName, String path, ReadableMap getOptions, Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+  public void documentGet(
+      String appName, String databaseId, String path, ReadableMap getOptions, Promise promise) {
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
 
     Source source;
@@ -127,7 +128,7 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
             getExecutor(),
             () -> {
               DocumentSnapshot documentSnapshot = Tasks.await(documentReference.get(source));
-              return snapshotToWritableMap(appName, documentSnapshot);
+              return snapshotToWritableMap(appName, databaseId, documentSnapshot);
             })
         .addOnCompleteListener(
             task -> {
@@ -140,8 +141,8 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
   }
 
   @ReactMethod
-  public void documentDelete(String appName, String path, Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+  public void documentDelete(String appName, String databaseId, String path, Promise promise) {
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
     Tasks.call(getTransactionalExecutor(), documentReference::delete)
         .addOnCompleteListener(
@@ -156,8 +157,13 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
 
   @ReactMethod
   public void documentSet(
-      String appName, String path, ReadableMap data, ReadableMap options, Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+      String appName,
+      String databaseId,
+      String path,
+      ReadableMap data,
+      ReadableMap options,
+      Promise promise) {
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
 
     Tasks.call(getTransactionalExecutor(), () -> parseReadableMap(firebaseFirestore, data))
@@ -195,8 +201,9 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
   }
 
   @ReactMethod
-  public void documentUpdate(String appName, String path, ReadableMap data, Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+  public void documentUpdate(
+      String appName, String databaseId, String path, ReadableMap data, Promise promise) {
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
     DocumentReference documentReference = getDocumentForFirestore(firebaseFirestore, path);
 
     Tasks.call(getTransactionalExecutor(), () -> parseReadableMap(firebaseFirestore, data))
@@ -214,8 +221,9 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
   }
 
   @ReactMethod
-  public void documentBatch(String appName, ReadableArray writes, Promise promise) {
-    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName);
+  public void documentBatch(
+      String appName, String databaseId, ReadableArray writes, Promise promise) {
+    FirebaseFirestore firebaseFirestore = getFirestoreForApp(appName, databaseId);
 
     Tasks.call(getTransactionalExecutor(), () -> parseDocumentBatches(firebaseFirestore, writes))
         .continueWithTask(
@@ -282,8 +290,8 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
   }
 
   private void sendOnSnapshotEvent(
-      String appName, int listenerId, DocumentSnapshot documentSnapshot) {
-    Tasks.call(getExecutor(), () -> snapshotToWritableMap(appName, documentSnapshot))
+      String appName, String databaseId, int listenerId, DocumentSnapshot documentSnapshot) {
+    Tasks.call(getExecutor(), () -> snapshotToWritableMap(appName, databaseId, documentSnapshot))
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -298,14 +306,16 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
                         ReactNativeFirebaseFirestoreEvent.DOCUMENT_EVENT_SYNC,
                         body,
                         appName,
+                        databaseId,
                         listenerId));
               } else {
-                sendOnSnapshotError(appName, listenerId, task.getException());
+                sendOnSnapshotError(appName, databaseId, listenerId, task.getException());
               }
             });
   }
 
-  private void sendOnSnapshotError(String appName, int listenerId, Exception exception) {
+  private void sendOnSnapshotError(
+      String appName, String databaseId, int listenerId, Exception exception) {
     WritableMap body = Arguments.createMap();
     WritableMap error = Arguments.createMap();
 
@@ -325,6 +335,10 @@ public class ReactNativeFirebaseFirestoreDocumentModule extends ReactNativeFireb
 
     emitter.sendEvent(
         new ReactNativeFirebaseFirestoreEvent(
-            ReactNativeFirebaseFirestoreEvent.DOCUMENT_EVENT_SYNC, body, appName, listenerId));
+            ReactNativeFirebaseFirestoreEvent.DOCUMENT_EVENT_SYNC,
+            body,
+            appName,
+            databaseId,
+            listenerId));
   }
 }

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreEvent.java

@@ -30,16 +30,19 @@ public class ReactNativeFirebaseFirestoreEvent implements NativeEvent {
   private static final String KEY_BODY = "body";
   private static final String KEY_APP_NAME = "appName";
   private static final String KEY_EVENT_NAME = "eventName";
+  private static final String DATABASE_ID = "databaseId";
   private String eventName;
   private WritableMap eventBody;
   private String appName;
+  private String databaseId;
   private int listenerId;
 
   ReactNativeFirebaseFirestoreEvent(
-      String eventName, WritableMap eventBody, String appName, int listenerId) {
+      String eventName, WritableMap eventBody, String appName, String databaseId, int listenerId) {
     this.eventName = eventName;
     this.eventBody = eventBody;
     this.appName = appName;
+    this.databaseId = databaseId;
     this.listenerId = listenerId;
   }
 
@@ -54,6 +57,7 @@ public class ReactNativeFirebaseFirestoreEvent implements NativeEvent {
     event.putInt(KEY_ID, listenerId);
     event.putMap(KEY_BODY, eventBody);
     event.putString(KEY_APP_NAME, appName);
+    event.putString(DATABASE_ID, databaseId);
     event.putString(KEY_EVENT_NAME, eventName);
     return event;
   }

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreModule.java

@@ -19,6 +19,8 @@ package io.invertase.firebase.firestore;
 
 import static io.invertase.firebase.common.RCTConvertFirebase.toHashMap;
 import static io.invertase.firebase.firestore.ReactNativeFirebaseFirestoreCommon.rejectPromiseFirestoreException;
+import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.createFirestoreKey;
+import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.getFirestoreForApp;
 
 import com.facebook.react.bridge.Arguments;
 import com.facebook.react.bridge.Promise;
@@ -28,6 +30,7 @@ import com.facebook.react.bridge.ReadableMap;
 import com.facebook.react.bridge.WritableMap;
 import com.google.firebase.firestore.FirebaseFirestore;
 import com.google.firebase.firestore.LoadBundleTaskProgress;
+import com.google.firebase.firestore.PersistentCacheIndexManager;
 import io.invertase.firebase.common.ReactNativeFirebaseModule;
 
 public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModule {
@@ -49,9 +52,9 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void loadBundle(String appName, String bundle, Promise promise) {
+  public void loadBundle(String appName, String databaseId, String bundle, Promise promise) {
     module
-        .loadBundle(appName, bundle)
+        .loadBundle(appName, databaseId, bundle)
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -64,9 +67,9 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void clearPersistence(String appName, Promise promise) {
+  public void clearPersistence(String appName, String databaseId, Promise promise) {
     module
-        .clearPersistence(appName)
+        .clearPersistence(appName, databaseId)
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -78,9 +81,9 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void waitForPendingWrites(String appName, Promise promise) {
+  public void waitForPendingWrites(String appName, String databaseId, Promise promise) {
     module
-        .waitForPendingWrites(appName)
+        .waitForPendingWrites(appName, databaseId)
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -92,9 +95,9 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void disableNetwork(String appName, Promise promise) {
+  public void disableNetwork(String appName, String databaseId, Promise promise) {
     module
-        .disableNetwork(appName)
+        .disableNetwork(appName, databaseId)
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -106,9 +109,9 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void enableNetwork(String appName, Promise promise) {
+  public void enableNetwork(String appName, String databaseId, Promise promise) {
     module
-        .enableNetwork(appName)
+        .enableNetwork(appName, databaseId)
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -120,9 +123,10 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void useEmulator(String appName, String host, int port, Promise promise) {
+  public void useEmulator(
+      String appName, String databaseId, String host, int port, Promise promise) {
     module
-        .useEmulator(appName, host, port)
+        .useEmulator(appName, databaseId, host, port)
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -134,9 +138,10 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void settings(String appName, ReadableMap settings, Promise promise) {
+  public void settings(String appName, String databaseId, ReadableMap settings, Promise promise) {
+    String firestoreKey = createFirestoreKey(appName, databaseId);
     module
-        .settings(appName, toHashMap(settings))
+        .settings(firestoreKey, toHashMap(settings))
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -148,9 +153,9 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
   }
 
   @ReactMethod
-  public void terminate(String appName, Promise promise) {
+  public void terminate(String appName, String databaseId, Promise promise) {
     module
-        .terminate(appName)
+        .terminate(appName, databaseId)
         .addOnCompleteListener(
             task -> {
               if (task.isSuccessful()) {
@@ -161,6 +166,33 @@ public class ReactNativeFirebaseFirestoreModule extends ReactNativeFirebaseModul
             });
   }
 
+  @ReactMethod
+  public void persistenceCacheIndexManager(
+      String appName, String databaseId, int requestType, Promise promise) {
+    PersistentCacheIndexManager indexManager =
+        getFirestoreForApp(appName, databaseId).getPersistentCacheIndexManager();
+    if (indexManager != null) {
+      switch (requestType) {
+        case 0:
+          indexManager.enableIndexAutoCreation();
+          break;
+        case 1:
+          indexManager.disableIndexAutoCreation();
+          break;
+        case 2:
+          indexManager.deleteAllIndexes();
+          break;
+      }
+    } else {
+      promise.reject(
+          "firestore/index-manager-null",
+          "`PersistentCacheIndexManager` is not available, persistence has not been enabled for"
+              + " Firestore");
+      return;
+    }
+    promise.resolve(null);
+  }
+
   private WritableMap taskProgressToWritableMap(LoadBundleTaskProgress progress) {
     WritableMap writableMap = Arguments.createMap();
     writableMap.putDouble("bytesLoaded", progress.getBytesLoaded());

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreQuery.java

@@ -38,10 +38,12 @@ import java.util.concurrent.Executor;
 
 public class ReactNativeFirebaseFirestoreQuery {
   String appName;
+  String databaseId;
   Query query;
 
   ReactNativeFirebaseFirestoreQuery(
       String appName,
+      String databaseId,
       Query query,
       ReadableArray filters,
       ReadableArray orders,
@@ -58,7 +60,7 @@ public class ReactNativeFirebaseFirestoreQuery {
         executor,
         () -> {
           QuerySnapshot querySnapshot = Tasks.await(query.get(source));
-          return snapshotToWritableMap(this.appName, "get", querySnapshot, null);
+          return snapshotToWritableMap(this.appName, this.databaseId, "get", querySnapshot, null);
         });
   }
 

package/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreSerialize.java

@@ -98,7 +98,8 @@ public class ReactNativeFirebaseFirestoreSerialize {
    * @param documentSnapshot DocumentSnapshot
    * @return WritableMap
    */
-  static WritableMap snapshotToWritableMap(String appName, DocumentSnapshot documentSnapshot) {
+  static WritableMap snapshotToWritableMap(
+      String appName, String databaseId, DocumentSnapshot documentSnapshot) {
     WritableArray metadata = Arguments.createArray();
     WritableMap documentMap = Arguments.createMap();
     SnapshotMetadata snapshotMetadata = documentSnapshot.getMetadata();
@@ -112,7 +113,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
     documentMap.putBoolean(KEY_EXISTS, documentSnapshot.exists());
 
     DocumentSnapshot.ServerTimestampBehavior timestampBehavior =
-        getServerTimestampBehavior(appName);
+        getServerTimestampBehavior(appName, databaseId);
 
     if (documentSnapshot.exists()) {
       if (documentSnapshot.getData(timestampBehavior) != null) {
@@ -132,6 +133,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
    */
   static WritableMap snapshotToWritableMap(
       String appName,
+      String databaseId,
       String source,
       QuerySnapshot querySnapshot,
       @Nullable MetadataChanges metadataChanges) {
@@ -148,7 +150,8 @@ public class ReactNativeFirebaseFirestoreSerialize {
       // indicating the data does not include these changes
       writableMap.putBoolean("excludesMetadataChanges", true);
       writableMap.putArray(
-          KEY_CHANGES, documentChangesToWritableArray(appName, documentChangesList, null));
+          KEY_CHANGES,
+          documentChangesToWritableArray(appName, databaseId, documentChangesList, null));
     } else {
       // If listening to metadata changes, get the changes list with document changes array.
       // To indicate whether a document change was because of metadata change, we check whether
@@ -159,7 +162,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
       writableMap.putArray(
           KEY_CHANGES,
           documentChangesToWritableArray(
-              appName, documentMetadataChangesList, documentChangesList));
+              appName, databaseId, documentMetadataChangesList, documentChangesList));
     }
 
     SnapshotMetadata snapshotMetadata = querySnapshot.getMetadata();
@@ -167,7 +170,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
 
     // set documents
     for (DocumentSnapshot documentSnapshot : documentSnapshots) {
-      documents.pushMap(snapshotToWritableMap(appName, documentSnapshot));
+      documents.pushMap(snapshotToWritableMap(appName, databaseId, documentSnapshot));
     }
     writableMap.putArray(KEY_DOCUMENTS, documents);
 
@@ -188,6 +191,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
    */
   private static WritableArray documentChangesToWritableArray(
       String appName,
+      String databaseId,
       List<DocumentChange> documentChanges,
       @Nullable List<DocumentChange> comparableDocumentChanges) {
     WritableArray documentChangesWritable = Arguments.createArray();
@@ -212,7 +216,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
       }
 
       documentChangesWritable.pushMap(
-          documentChangeToWritableMap(appName, documentChange, isMetadataChange));
+          documentChangeToWritableMap(appName, databaseId, documentChange, isMetadataChange));
     }
 
     return documentChangesWritable;
@@ -225,7 +229,7 @@ public class ReactNativeFirebaseFirestoreSerialize {
    * @return WritableMap
    */
   private static WritableMap documentChangeToWritableMap(
-      String appName, DocumentChange documentChange, boolean isMetadataChange) {
+      String appName, String databaseId, DocumentChange documentChange, boolean isMetadataChange) {
     WritableMap documentChangeMap = Arguments.createMap();
     documentChangeMap.putBoolean("isMetadataChange", isMetadataChange);
 
@@ -242,7 +246,8 @@ public class ReactNativeFirebaseFirestoreSerialize {
     }
 
     documentChangeMap.putMap(
-        KEY_DOC_CHANGE_DOCUMENT, snapshotToWritableMap(appName, documentChange.getDocument()));
+        KEY_DOC_CHANGE_DOCUMENT,
+        snapshotToWritableMap(appName, databaseId, documentChange.getDocument()));
 
     documentChangeMap.putInt(KEY_DOC_CHANGE_NEW_INDEX, documentChange.getNewIndex());
     documentChangeMap.putInt(KEY_DOC_CHANGE_OLD_INDEX, documentChange.getOldIndex());