fix(firestore): remove all listeners correctly

capawesome-team · Oct 30, 2023 · e6e75ad · e6e75ad
1 parent b99f865
commit e6e75ad
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/mighty-planets-brush.md b/.changeset/mighty-planets-brush.md
@@ -0,0 +1,5 @@
+---
+'@capacitor-firebase/firestore': patch
+---
+
+fix: remove all listeners correctly
diff --git a/...in/java/io/capawesome/capacitorjs/plugins/firebase/firestore/FirebaseFirestorePlugin.java b/...in/java/io/capawesome/capacitorjs/plugins/firebase/firestore/FirebaseFirestorePlugin.java
@@ -452,7 +452,7 @@ public void removeAllListeners(PluginCall call) {
             }
 
             implementation.removeAllListeners();
-            call.resolve();
+            super.removeAllListeners(call);
         } catch (Exception exception) {
             Logger.error(TAG, exception.getMessage(), exception);
             call.reject(exception.getMessage());

diff --git a/packages/firestore/ios/Plugin/FirebaseFirestorePlugin.swift b/packages/firestore/ios/Plugin/FirebaseFirestorePlugin.swift
@@ -290,6 +290,6 @@ public class FirebaseFirestorePlugin: CAPPlugin {
         self.pluginCallMap.removeAll()
 
         implementation?.removeAllListeners()
-        call.resolve()
+        super.removeAllListeners(call)
     }
 }
diff --git a/packages/firestore/src/web.ts b/packages/firestore/src/web.ts
@@ -232,6 +232,7 @@ export class FirebaseFirestoreWeb
   public async removeAllListeners(): Promise<void> {
     this.unsubscribesMap.forEach(unsubscribe => unsubscribe());
     this.unsubscribesMap.clear();
+    await super.removeAllListeners();
   }
 
   private async buildCollectionQuery(