feat: removeChangeListener handles documentChangeListener

Author: Wojtach

expo-example/ios/expoexample.xcodeproj/project.pbxproj

@@ -367,7 +367,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.rn.expo-example";
-				PRODUCT_NAME = expoexample;
+				PRODUCT_NAME = "expoexample";
 				SWIFT_OBJC_BRIDGING_HEADER = "expoexample/expoexample-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -395,7 +395,7 @@
 				);
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = "com.couchbase.rn.expo-example";
-				PRODUCT_NAME = expoexample;
+				PRODUCT_NAME = "expoexample";
 				SWIFT_OBJC_BRIDGING_HEADER = "expoexample/expoexample-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";

ios/CblReactnative.swift

@@ -1197,13 +1197,18 @@ func replicator_AddDocumentChangeListener(
       }
       backgroundQueue.async {
         if let listener = self.replicatorChangeListeners[token] as? ListenerToken {
-          replicator.removeChangeListener(withToken: listener)
-          self.replicatorChangeListeners.removeValue(forKey: token)
-          resolve(nil)
-          
-        } else {
-          reject("REPLICATOR_ERROR", "No such replicator listener found with token \(token)", nil)
-        }
+        replicator.removeChangeListener(withToken: listener)
+        self.replicatorChangeListeners.removeValue(forKey: token)
+        resolve(nil)
+        return
+      } else if let listener = self.replicatorDocumentChangeListeners[token] as? ListenerToken {
+        replicator.removeChangeListener(withToken: listener)
+        self.replicatorDocumentChangeListeners.removeValue(forKey: token)
+        resolve(nil)
+        return
+      } else {
+        reject("REPLICATOR_ERROR", "No such listener found with token \(token)", nil)
+      }
 
       }
     }

src/CblReactNativeEngine.tsx

@@ -1145,6 +1145,17 @@ export class CblReactNativeEngine implements ICoreEngine {
   replicator_RemoveChangeListener(
     args: ReplicationChangeListenerArgs
   ): Promise<void> {
+    if (this._replicatorDocumentChangeListeners.has(args.changeListenerToken)) {
+      this._replicatorDocumentChangeListeners.delete(args.changeListenerToken);
+      // Remove any subscription with the doc suffix
+      if (this._emitterSubscriptions.has(args.changeListenerToken + '_doc')) {
+        this._emitterSubscriptions
+          .get(args.changeListenerToken + '_doc')
+          ?.remove();
+        this._emitterSubscriptions.delete(args.changeListenerToken + '_doc');
+      }
+    }
+
     //remove the event subscription or you will have a leak
     if (this._emitterSubscriptions.has(args.changeListenerToken)) {
       this._emitterSubscriptions.get(args.changeListenerToken)?.remove();