Make removeSnapshotsInSyncListener run on AQ (#1572)

firebase · May 19, 2020 · b1172c9 · b1172c9
1 parent 56fc810
commit b1172c9
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java b/firebase-firestore/src/main/java/com/google/firebase/firestore/core/FirestoreClient.java
@@ -265,10 +265,11 @@ public void addSnapshotsInSyncListener(EventListener<Void> listener) {
   }
 
   public void removeSnapshotsInSyncListener(EventListener<Void> listener) {
+    // Checks for shutdown but does not raise error, allowing remove after shutdown to be a no-op.
     if (isTerminated()) {
       return;
     }
-    eventManager.removeSnapshotsInSyncListener(listener);
+    asyncQueue.enqueueAndForget(() -> eventManager.removeSnapshotsInSyncListener(listener));
   }
 
   private void verifyNotTerminated() {