Merge branch 'main' into auth-13567

firebase · Nov 4, 2024 · 6f46784 · 6f46784
2 parents 7047151 + a4be697
commit 6f46784
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/...main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestoreMessageCodec.java b/...main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestoreMessageCodec.java
@@ -290,11 +290,11 @@ private FirebaseFirestore readFirestoreInstance(ByteBuffer buffer) {
     String databaseURL = (String) readValue(buffer);
     FirebaseFirestoreSettings settings = (FirebaseFirestoreSettings) readValue(buffer);
     synchronized (FlutterFirebaseFirestorePlugin.firestoreInstanceCache) {
-      if (FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-              appName, databaseURL)
-          != null) {
-        return FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-            appName, databaseURL);
+      FirebaseFirestore cachedFirestoreInstance =
+          FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
+              appName, databaseURL);
+      if (cachedFirestoreInstance != null) {
+        return cachedFirestoreInstance;
       }
 
       FirebaseApp app = FirebaseApp.getInstance(appName);

diff --git a/...d/src/main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestorePlugin.java b/...d/src/main/java/io/flutter/plugins/firebase/firestore/FlutterFirebaseFirestorePlugin.java
@@ -309,11 +309,11 @@ static FirebaseFirestoreSettings getSettingsFromPigeon(
   public static FirebaseFirestore getFirestoreFromPigeon(
       GeneratedAndroidFirebaseFirestore.FirestorePigeonFirebaseApp pigeonApp) {
     synchronized (FlutterFirebaseFirestorePlugin.firestoreInstanceCache) {
-      if (FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-              pigeonApp.getAppName(), pigeonApp.getDatabaseURL())
-          != null) {
-        return FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
-            pigeonApp.getAppName(), pigeonApp.getDatabaseURL());
+      FirebaseFirestore cachedFirestoreInstance =
+          FlutterFirebaseFirestorePlugin.getFirestoreInstanceByNameAndDatabaseUrl(
+              pigeonApp.getAppName(), pigeonApp.getDatabaseURL());
+      if (cachedFirestoreInstance != null) {
+        return cachedFirestoreInstance;
       }
 
       FirebaseApp app = FirebaseApp.getInstance(pigeonApp.getAppName());

diff --git a/packages/firebase_core/firebase_core/ios/firebase_sdk_version.rb b/packages/firebase_core/firebase_core/ios/firebase_sdk_version.rb
@@ -1,4 +1,4 @@
 # https://firebase.google.com/support/release-notes/ios
 def firebase_sdk_version!()
-  '11.2.0'
+  '11.4.0'
 end