Skip to content

Commit 7697d0e

Browse files
committed
Quick fix for a couple of memory leaks.
1 parent 1b79c41 commit 7697d0e

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Source/NativePusher.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
private var failedRequestAttempts: Int = 0
2626
private let maxFailedRequestAttempts: Int = 6
2727

28-
internal var delegate: PusherDelegate? = nil
28+
internal weak var delegate: PusherDelegate? = nil
2929

3030
internal var requestQueue = TaskQueue()
3131

Source/PusherChannel.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ open class PusherChannel: NSObject {
3434
open var eventHandlers: [String: [EventHandler]] = [:]
3535
open var subscribed = false
3636
open let name: String
37-
open let connection: PusherConnection
37+
open weak var connection: PusherConnection?
3838
open var unsentEvents = [PusherEvent]()
3939
open let type: PusherChannelType
4040

@@ -110,10 +110,10 @@ open class PusherChannel: NSObject {
110110
*/
111111
open func handleEvent(name: String, data: String) {
112112
if let eventHandlerArray = self.eventHandlers[name] {
113-
let jsonize = connection.options.attemptToReturnJSONObject
113+
let jsonize = connection?.options.attemptToReturnJSONObject ?? false
114114

115115
for eventHandler in eventHandlerArray {
116-
eventHandler.callback(jsonize ? connection.getEventDataJSON(from: data) : data)
116+
eventHandler.callback(jsonize ? connection?.getEventDataJSON(from: data) : data)
117117
}
118118
}
119119
}
@@ -127,7 +127,7 @@ open class PusherChannel: NSObject {
127127
*/
128128
open func trigger(eventName: String, data: Any) {
129129
if subscribed {
130-
self.connection.sendEvent(event: eventName, data: data, channel: self)
130+
connection?.sendEvent(event: eventName, data: data, channel: self)
131131
} else {
132132
unsentEvents.insert(PusherEvent(name: eventName, data: data), at: 0)
133133
}

0 commit comments

Comments
 (0)