Use eventSubject on AirshipProxyEmitter

urbanairship · Nov 27, 2023 · d4eb775 · d4eb775
1 parent 78fed6d
commit d4eb775
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/ios/Classes/SwiftAirshipPlugin.swift b/ios/Classes/SwiftAirshipPlugin.swift
@@ -18,9 +18,6 @@ public class SwiftAirshipPlugin: NSObject, FlutterPlugin {
         .notificationStatusChanged: "com.airship.flutter/event/notification_status_changed"
     ]
 
-
-    private static let eventSubject = PassthroughSubject<AirshipProxyEventType, Never>()
-
     private let streams: [AirshipProxyEventType: AirshipEventStream] = {
         var streams: [AirshipProxyEventType: AirshipEventStream] = [:]
         SwiftAirshipPlugin.eventNames.forEach { (key: AirshipProxyEventType, value: String) in
@@ -31,7 +28,6 @@ public class SwiftAirshipPlugin: NSObject, FlutterPlugin {
 
     private var subscriptions = Set<AnyCancellable>()
 
-
     public static func register(with registrar: FlutterPluginRegistrar) {
         SwiftAirshipPlugin().setup(registrar: registrar)
     }
@@ -51,10 +47,11 @@ public class SwiftAirshipPlugin: NSObject, FlutterPlugin {
         registrar.register(AirshipInboxMessageViewFactory(registrar), withId: "com.airship.flutter/InboxMessageView")
         registrar.addApplicationDelegate(self)
 
-        SwiftAirshipPlugin.eventSubject.sink { [streams] eventType in
-            guard let stream = streams[eventType] else {
+        AirshipProxyEventEmitter.shared.eventSubject.sink { [weak self] (event: any AirshipProxyEvent) in
+            guard let self = self, let stream = self.streams[event.type] else {
                 return
             }
+
             Task {
                 await stream.processPendingEvents()
             }