ensure flush completion handler is always called

jaredmixpanel · jaredmixpanel · commit 29473edda505 · 2022-05-04T16:18:46.000-07:00
diff --git a/Sources/MixpanelInstance.swift b/Sources/MixpanelInstance.swift
@@ -856,10 +856,16 @@ extension MixpanelInstance {
         }
         trackingQueue.async { [weak self, completion] in
             guard let self = self else {
+                if let completion = completion {
+                    DispatchQueue.main.async(execute: completion)
+                }
                 return
             }
             
             if let shouldFlush = self.delegate?.mixpanelWillFlush(self), !shouldFlush {
+                if let completion = completion {
+                    DispatchQueue.main.async(execute: completion)
+                }
                 return
             }
             
@@ -873,6 +879,9 @@ extension MixpanelInstance {
             
             self.networkQueue.async { [weak self, completion] in
                 guard let self = self else {
+                    if let completion = completion {
+                        DispatchQueue.main.async(execute: completion)
+                    }
                     return
                 }
                 self.flushQueue(eventQueue, type: .events)

Original file line number	Diff line number	Diff line change
`@@ -856,10 +856,16 @@ extension MixpanelInstance {`
`856`	`856`	`}`
`857`	`857`	`trackingQueue.async { [weak self, completion] in`
`858`	`858`	`guard let self = self else {`
	`859`	`+ if let completion = completion {`
	`860`	`+ DispatchQueue.main.async(execute: completion)`
	`861`	`+ }`
`859`	`862`	`return`
`860`	`863`	`}`
`861`	`864`
`862`	`865`	`if let shouldFlush = self.delegate?.mixpanelWillFlush(self), !shouldFlush {`
	`866`	`+ if let completion = completion {`
	`867`	`+ DispatchQueue.main.async(execute: completion)`
	`868`	`+ }`
`863`	`869`	`return`
`864`	`870`	`}`
`865`	`871`
`@@ -873,6 +879,9 @@ extension MixpanelInstance {`
`873`	`879`
`874`	`880`	`self.networkQueue.async { [weak self, completion] in`
`875`	`881`	`guard let self = self else {`
	`882`	`+ if let completion = completion {`
	`883`	`+ DispatchQueue.main.async(execute: completion)`
	`884`	`+ }`
`876`	`885`	`return`
`877`	`886`	`}`
`878`	`887`	`self.flushQueue(eventQueue, type: .events)`