Skip to content
Closed
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class BackgroundWorker(
}

private val dartTask
get() = workerParams.inputData.getString(DART_TASK_KEY)!!
get() = workerParams.inputData.getString(DART_TASK_KEY)

private val runAttemptCount = workerParams.runAttemptCount
private val randomThreadIdentifier = Random().nextInt()
Expand Down Expand Up @@ -86,11 +86,20 @@ class BackgroundWorker(
return@ensureInitializationCompleteAsync
}

val localDartTask = dartTask

if (localDartTask == null) {
val exception = IllegalStateException("Dart task is null")
WorkmanagerDebug.onExceptionEncountered(applicationContext, null, exception)
completer?.set(Result.failure())
return@ensureInitializationCompleteAsync
}

val dartBundlePath = flutterLoader.findAppBundlePath()

val taskInfo =
TaskDebugInfo(
taskName = dartTask,
taskName = localDartTask,
inputData = payload,
startTime = startTime,
callbackHandle = callbackHandle,
Expand Down Expand Up @@ -132,9 +141,18 @@ class BackgroundWorker(
) {
val fetchDuration = System.currentTimeMillis() - startTime

val localDartTask = dartTask

if (localDartTask == null) {
val exception = IllegalStateException("Dart task is null")
WorkmanagerDebug.onExceptionEncountered(applicationContext, null, exception)
completer?.set(Result.failure())
return
}

val taskInfo =
TaskDebugInfo(
taskName = dartTask,
taskName = localDartTask,
inputData = payload,
startTime = startTime,
)
Expand Down Expand Up @@ -175,7 +193,17 @@ class BackgroundWorker(
// Convert payload to the format expected by Pigeon (Map<String?, Object?>)
val pigeonPayload = payload.mapKeys { it.key as String? }.mapValues { it.value as Object? }

flutterApi.executeTask(dartTask, pigeonPayload) { result ->
val localDartTask = dartTask

if (localDartTask == null) {
val exception = IllegalStateException("Dart task is null")
WorkmanagerDebug.onExceptionEncountered(applicationContext, null, exception)

stopEngine(Result.failure(), exception.message)
return
}

flutterApi.executeTask(localDartTask, pigeonPayload) { result ->
when {
result.isSuccess -> {
val wasSuccessful = result.getOrNull() ?: false
Expand Down
Loading