Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IMAPlugin Unowned Self Crash Fix #30

Merged
merged 1 commit into from Mar 25, 2019
Merged

IMAPlugin Unowned Self Crash Fix #30

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
19 changes: 11 additions & 8 deletions IMAPlugin.swift
View file
Open in desktop
Expand Up @@ -192,20 +192,23 @@ enum IMAState: Int, StateProtocol {
// notify ads requested
self.notify(event: AdEvent.AdsRequested(adTagUrl: self.config.adTagUrl))
// start timeout timer
self.requestTimeoutTimer = PKTimer.after(self.requestTimeoutInterval) { [unowned self] _ in
if self.adsManager == nil {
self.requestTimeoutTimer = PKTimer.after(self.requestTimeoutInterval) { [weak self] _ in

guard let strongSelf = self else { return }

if strongSelf.adsManager == nil {
PKLog.debug("Ads request timed out")
switch self.stateMachine.getState() {
case .adsRequested: self.delegate?.adsRequestTimedOut(shouldPlay: false)
case .adsRequestedAndPlay: self.delegate?.adsRequestTimedOut(shouldPlay: true)
switch strongSelf.stateMachine.getState() {
case .adsRequested: strongSelf.delegate?.adsRequestTimedOut(shouldPlay: false)
case .adsRequestedAndPlay: strongSelf.delegate?.adsRequestTimedOut(shouldPlay: true)
default: break // should not receive timeout for any other state
}
// set state to request failure
self.stateMachine.set(state: .adsRequestTimedOut)
strongSelf.stateMachine.set(state: .adsRequestTimedOut)

self.invalidateRequestTimer()
strongSelf.invalidateRequestTimer()
// post ads request timeout event
self.notify(event: AdEvent.RequestTimedOut())
strongSelf.notify(event: AdEvent.RequestTimedOut())
}
}
}
Expand Down