fix(firestore, android): fix a race condition that could cause a cras…

…h when adding event channels while closing the app (#11881)
firebase · Nov 14, 2023 · 963c1b8 · 963c1b8
1 parent 85e7129
commit 963c1b8
Showing 1 changed file with 10 additions and 6 deletions.
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
@@ -255,15 +255,19 @@ private String registerEventChannel(String prefix, String identifier, StreamHand
   }
 
   private void removeEventListeners() {
-    for (String identifier : eventChannels.keySet()) {
-      eventChannels.get(identifier).setStreamHandler(null);
+    synchronized (eventChannels) {
+      for (String identifier : eventChannels.keySet()) {
+        eventChannels.get(identifier).setStreamHandler(null);
+      }
+      eventChannels.clear();
     }
-    eventChannels.clear();
 
-    for (String identifier : streamHandlers.keySet()) {
-      streamHandlers.get(identifier).onCancel(null);
+    synchronized (streamHandlers) {
+      for (String identifier : streamHandlers.keySet()) {
+        streamHandlers.get(identifier).onCancel(null);
+      }
+      streamHandlers.clear();
     }
-    streamHandlers.clear();
 
     transactionHandlers.clear();
   }