Skip to content

Commit 2b19081

Browse files
committed
keep onResultSend method
1 parent 231a448 commit 2b19081

3 files changed

Lines changed: 23 additions & 13 deletions

File tree

workmanager/lib/src/workmanager_impl.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ class Workmanager {
138138
.arguments["dev.fluttercommunity.workmanager.INPUT_DATA"]
139139
.cast<String, dynamic>();
140140

141-
if (call.method == "backgroundChannelInitialized") {
141+
if (call.method == "onResultSend") {
142142
return _backgroundTaskHandler?.call(
143143
call.arguments["dev.fluttercommunity.workmanager.DART_TASK"],
144144
inputData,

workmanager_android/android/src/main/kotlin/dev/fluttercommunity/workmanager/BackgroundWorker.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ class BackgroundWorker(
3838
const val BACKGROUND_CHANNEL_NAME =
3939
"dev.fluttercommunity.workmanager/background_channel_work_manager"
4040
const val BACKGROUND_CHANNEL_INITIALIZED = "backgroundChannelInitialized"
41+
const val ON_RESULT_SEND = "onResultSend"
4142

4243
private val flutterLoader = FlutterLoader()
4344
}
@@ -158,7 +159,7 @@ class BackgroundWorker(
158159
when (call.method) {
159160
BACKGROUND_CHANNEL_INITIALIZED -> {
160161
backgroundChannel.invokeMethod(
161-
BACKGROUND_CHANNEL_INITIALIZED,
162+
ON_RESULT_SEND,
162163
mapOf(DART_TASK_KEY to dartTask, PAYLOAD_KEY to payload),
163164
object : MethodChannel.Result {
164165
override fun notImplemented() {

workmanager_apple/ios/Classes/BackgroundWorker.swift

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,10 @@ class BackgroundWorker {
4646
let flutterPluginRegistrantCallback: FlutterPluginRegistrantCallback?
4747
let inputData: [String: Any]?
4848

49-
init(mode: BackgroundMode, inputData: [String: Any]?, flutterPluginRegistrantCallback: FlutterPluginRegistrantCallback?) {
49+
init(
50+
mode: BackgroundMode, inputData: [String: Any]?,
51+
flutterPluginRegistrantCallback: FlutterPluginRegistrantCallback?
52+
) {
5053
backgroundMode = mode
5154
self.inputData = inputData
5255
self.flutterPluginRegistrantCallback = flutterPluginRegistrantCallback
@@ -55,18 +58,21 @@ class BackgroundWorker {
5558
private struct BackgroundChannel {
5659
static let name = "\(SwiftWorkmanagerPlugin.identifier)/background_channel_work_manager"
5760
static let initialized = "backgroundChannelInitialized"
58-
static let onResultSendCommand = "backgroundChannelInitialized"
61+
static let onResultSendCommand = "onResultSend"
5962
}
6063

6164
/// The result is discardable due to how [BackgroundTaskOperation] works.
6265
@discardableResult
63-
func performBackgroundRequest(_ completionHandler: @escaping (UIBackgroundFetchResult) -> Void) -> Bool {
66+
func performBackgroundRequest(_ completionHandler: @escaping (UIBackgroundFetchResult) -> Void)
67+
-> Bool
68+
{
6469
guard let callbackHandle = UserDefaultsHelper.getStoredCallbackHandle(),
65-
let flutterCallbackInformation = FlutterCallbackCache.lookupCallbackInformation(callbackHandle)
66-
else {
67-
logError("[\(String(describing: self))] \(WMPError.workmanagerNotInitialized.message)")
68-
completionHandler(.failed)
69-
return false
70+
let flutterCallbackInformation = FlutterCallbackCache.lookupCallbackInformation(
71+
callbackHandle)
72+
else {
73+
logError("[\(String(describing: self))] \(WMPError.workmanagerNotInitialized.message)")
74+
completionHandler(.failed)
75+
return false
7076
}
7177

7278
let taskSessionStart = Date()
@@ -105,7 +111,7 @@ class BackgroundWorker {
105111
backgroundMethodChannel?.setMethodCallHandler { call, result in
106112
switch call.method {
107113
case BackgroundChannel.initialized:
108-
result(true) // Agree to Flutter's method invocation
114+
result(true) // Agree to Flutter's method invocation
109115
var arguments: [String: Any] = self.backgroundMode.onResultSendArguments
110116
if let inputData = self.inputData {
111117
arguments["dev.fluttercommunity.workmanager.INPUT_DATA"] = inputData
@@ -117,9 +123,12 @@ class BackgroundWorker {
117123
result: { flutterResult in
118124
cleanupFlutterResources()
119125
let taskSessionCompleter = Date()
120-
let result: UIBackgroundFetchResult = (flutterResult as? Bool ?? false) ? .newData : .failed
126+
let result: UIBackgroundFetchResult =
127+
(flutterResult as? Bool ?? false) ? .newData : .failed
121128
let taskDuration = taskSessionCompleter.timeIntervalSince(taskSessionStart)
122-
logInfo("[\(String(describing: self))] \(#function) -> performBackgroundRequest.\(result) (finished in \(taskDuration.formatToSeconds()))")
129+
logInfo(
130+
"[\(String(describing: self))] \(#function) -> performBackgroundRequest.\(result) (finished in \(taskDuration.formatToSeconds()))"
131+
)
123132

124133
debugHelper.showCompletedFetchNotification(
125134
completedDate: taskSessionCompleter,

0 commit comments

Comments
 (0)