Skip to content

fix(ios): replace sleep(5) in applicationWillTerminate with bounded wait #400

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

Open
vaibhavppandey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ios): replace sleep(5) in applicationWillTerminate with bounded wait #400

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ...er_foreground_task/Sources/flutter_foreground_task/SwiftFlutterForegroundTaskPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,14 @@ public class SwiftFlutterForegroundTaskPlugin: NSObject, FlutterPlugin {
}

BackgroundServiceStatus.setData(action: BackgroundServiceAction.APP_TERMINATE)
BackgroundService.sharedInstance.run()
var isDestroyed = false
BackgroundService.sharedInstance.run(onDestroyed: { isDestroyed = true })

// Chance to handle onDestroy before app terminates
sleep(5)
// Wait for onDestroy (max 2s); spin run loop so its reply is served. System allows ~5s total.
let deadline = Date().addingTimeInterval(2)
while !isDestroyed && Date() < deadline {
RunLoop.current.run(mode: .default, before: deadline)
}
}

// ================= Service Delegate =================
Expand Down
12 changes: 8 additions & 4 deletions ios/flutter_foreground_task/Sources/flutter_foreground_task/service/BackgroundService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class BackgroundService: NSObject {
super.init()
}

func run() {
func run(onDestroyed: @escaping () -> Void = {}) {
backgroundServiceStatus = BackgroundServiceStatus.getData()
notificationOptions = NotificationOptions.getData()
notificationContent = NotificationContent.getData()
Expand Down Expand Up @@ -93,7 +93,7 @@ class BackgroundService: NSObject {
}
break
case .API_STOP, .APP_TERMINATE:
destroyForegroundTask()
destroyForegroundTask(onDestroyed: onDestroyed)
removeAllNotification()
isRunningService = false
break
Expand Down Expand Up @@ -199,8 +199,12 @@ class BackgroundService: NSObject {
foregroundTask?.update(taskEventAction: currForegroundTaskOptions.eventAction)
}

private func destroyForegroundTask() {
foregroundTask?.destroy()
private func destroyForegroundTask(onDestroyed: @escaping () -> Void = {}) {
if let foregroundTask = foregroundTask {
foregroundTask.destroy(onDestroyed: onDestroyed)
} else {
onDestroyed()
}
foregroundTask = nil
}
}
11 changes: 10 additions & 1 deletion ios/flutter_foreground_task/Sources/flutter_foreground_task/service/ForegroundTask.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,11 @@ class ForegroundTask {
}
}

func destroy() {
func destroy(onDestroyed: @escaping () -> Void = {}) {
if isDestroyed {
onDestroyed()
return
}
runIfNotDestroyed {
stopRepeatTask()

Expand All @@ -164,10 +168,15 @@ class ForegroundTask {
taskLifecycleListener.onEngineWillDestroy()
flutterEngine?.destroyContext()
flutterEngine = nil
onDestroyed()
} else {
if backgroundChannel == nil {
onDestroyed()
}
backgroundChannel?.invokeMethod(ACTION_TASK_DESTROY, arguments: nil) { _ in
self.flutterEngine?.destroyContext()
self.flutterEngine = nil
onDestroyed()
}
taskLifecycleListener.onTaskDestroy()
taskLifecycleListener.onEngineWillDestroy()
Expand Down