Update Event Producer to accept multiple subscribers

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h

@@ -326,6 +326,7 @@ typedef enum {GET, POST, HEAD, PUT, DELETE, OPTIONS, CONNECT, TRACE, PATCH} HTTP
 #define OS_PUSH_SUBSCRIPTION_MODEL_KEY                                      @"OS_PUSH_SUBSCRIPTION_MODEL_KEY"
 #define OS_PUSH_SUBSCRIPTION_MODEL_STORE_KEY                                @"OS_PUSH_SUBSCRIPTION_MODEL_STORE_KEY"
 #define OS_SUBSCRIPTION_MODEL_STORE_KEY                                     @"OS_SUBSCRIPTION_MODEL_STORE_KEY"
+#define OS_MODEL_STORE_LISTENER_POSTFIX                                     @"_LISTENER"
 
 // Deltas
 #define OS_ADD_ALIAS_DELTA                                                  @"OS_ADD_ALIAS_DELTA"

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSEventProducer.swift

@@ -29,24 +29,27 @@ import Foundation
 import OneSignalCore
 
 public class OSEventProducer<THandler>: NSObject {
-    // Not an array as there is at most 1 subsriber per OSEventProducer anyway
-    var subscriber: THandler?
+    private var subscribers: [String: THandler] = [:]
+    private let lock = NSLock()
 
-    public func subscribe(_ handler: THandler) {
-        // TODO: UM do we want to synchronize on subscribers
-        subscriber = handler // TODO: UM style, implicit or explicit self?
+    public func subscribe(_ handler: THandler, key: String) {
+        lock.withLock {
+            subscribers[key] = handler
+        }
     }
 
-    public func unsubscribe(_ handler: THandler) {
+    public func unsubscribe(_ handler: THandler, key: String) {
         OneSignalLog.onesignalLog(.LL_VERBOSE, message: "OSEventProducer.unsubscribe() called with handler: \(handler)")
-        // TODO: UM do we want to synchronize on subscribers
-        subscriber = nil
+        lock.withLock {
+            subscribers.removeValue(forKey: key)
+        }
     }
 
     public func fire(callback: (THandler) -> Void) {
-        // dump(subscribers) -> uncomment for more verbose log during testing
-        if let subscriber = subscriber {
-            callback(subscriber)
+        lock.withLock {
+            for subscriber in subscribers.values {
+                callback(subscriber)
+            }
         }
     }
 }

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStore.swift

@@ -47,7 +47,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
 
         // listen for changes to the models
         for model in self.models.values {
-            model.changeNotifier.subscribe(self)
+            model.changeNotifier.subscribe(self, key: storeKey)
         }
     }
 
@@ -96,7 +96,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
         OneSignalUserDefaults.initShared().saveCodeableData(forKey: self.storeKey, withValue: self.models)
 
         // listen for changes to this model
-        model.changeNotifier.subscribe(self)
+        model.changeNotifier.subscribe(self, key: storeKey)
 
         guard !hydrating else {
             return
@@ -121,7 +121,7 @@ open class OSModelStore<TModel: OSModel>: NSObject {
             OneSignalUserDefaults.initShared().saveCodeableData(forKey: self.storeKey, withValue: self.models)
 
             // no longer listen for changes to this model
-            model.changeNotifier.unsubscribe(self)
+            model.changeNotifier.unsubscribe(self, key: storeKey)
 
             self.changeSubscription.fire { modelStoreListener in
                 modelStoreListener.onRemoved(model)

iOS_SDK/OneSignalSDK/OneSignalOSCore/Source/OSModelStoreListener.swift

@@ -44,11 +44,13 @@ public protocol OSModelStoreListener: OSModelStoreChangedHandler {
 
 extension OSModelStoreListener {
     public func start() {
-        store.changeSubscription.subscribe(self)
+        let key = store.storeKey + OS_MODEL_STORE_LISTENER_POSTFIX
+        store.changeSubscription.subscribe(self, key: key)
     }
 
     public func close() {
-        store.changeSubscription.unsubscribe(self)
+        let key = store.storeKey + OS_MODEL_STORE_LISTENER_POSTFIX
+        store.changeSubscription.unsubscribe(self, key: key)
     }
 
     public func onAdded(_ model: OSModel) {