From e8ea87c9569e35df8140c4a877144ce495702398 Mon Sep 17 00:00:00 2001
From: russellwheatley <russellwheatley85@gmail.com>
Date: Mon, 12 Aug 2024 12:46:23 +0100
Subject: [PATCH] fix(firestore): use databaseId for persistent cache index
 manager

---
 .../firestore/ReactNativeFirebaseFirestoreModule.java      | 7 ++++---
 packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreModule.java b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreModule.java
index 618e2ede34..b8f5ceaab4 100644
--- a/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreModule.java
+++ b/packages/firestore/android/src/reactnative/java/io/invertase/firebase/firestore/ReactNativeFirebaseFirestoreModule.java
@@ -19,8 +19,8 @@
 
 import static io.invertase.firebase.common.RCTConvertFirebase.toHashMap;
 import static io.invertase.firebase.firestore.ReactNativeFirebaseFirestoreCommon.rejectPromiseFirestoreException;
-import static io.invertase.firebase.firestore.UniversalFirebaseFirestoreCommon.getFirestoreForApp;
 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;
@@ -167,9 +167,10 @@ public void terminate(String appName, String databaseId, Promise promise) {
   }
 
   @ReactMethod
-  public void persistenceCacheIndexManager(String appName, int requestType, Promise promise) {
+  public void persistenceCacheIndexManager(
+      String appName, String databaseId, int requestType, Promise promise) {
     PersistentCacheIndexManager indexManager =
-        getFirestoreForApp(appName).getPersistentCacheIndexManager();
+        getFirestoreForApp(appName, databaseId).getPersistentCacheIndexManager();
     if (indexManager != null) {
       switch (requestType) {
         case 0:
diff --git a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m
index 2c681fb8e3..bdb1a1de48 100644
--- a/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m
+++ b/packages/firestore/ios/RNFBFirestore/RNFBFirestoreModule.m
@@ -210,11 +210,13 @@ + (BOOL)requiresMainQueueSetup {
 
 RCT_EXPORT_METHOD(persistenceCacheIndexManager
                   : (FIRApp *)firebaseApp
+                  : (NSString *)databaseId
                   : (NSInteger)requestType
                   : (RCTPromiseResolveBlock)resolve
                   : (RCTPromiseRejectBlock)reject) {
   FIRPersistentCacheIndexManager *persistentCacheIndexManager =
-      [RNFBFirestoreCommon getFirestoreForApp:firebaseApp].persistentCacheIndexManager;
+      [RNFBFirestoreCommon getFirestoreForApp:firebaseApp databaseId:databaseId]
+          .persistentCacheIndexManager;
 
   if (persistentCacheIndexManager) {
     switch (requestType) {