Skip to content

fix(document_scanner): prevent 'Reply already submitted' on duplicate activity result #858

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

Closed
MilanJa wants to merge 1 commit into from
Closed

fix(document_scanner): prevent 'Reply already submitted' on duplicate activity result #858

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
26 changes: 20 additions & 6 deletions ...ment_scanner/android/src/main/kotlin/com/google_mlkit_document_scanner/DocumentScanner.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class DocumentScanner(
if (scanner == null) {
val options =
call.argument<Map<String, Any>>("options") ?: run {
result.error(TAG, "Invalid options", null)
consumePendingResult()?.error(TAG, "Invalid options", null)
return
}
val scannerOptions = parseOptions(options)
Expand All @@ -76,10 +76,10 @@ class DocumentScanner(
try {
activity.startIntentSenderForResult(intentSender, START_DOCUMENT_ACTIVITY, null, 0, 0, 0)
} catch (e: IntentSender.SendIntentException) {
result.error(TAG, "Failed to start document scanner", null)
consumePendingResult()?.error(TAG, "Failed to start document scanner", null)
}
}.addOnFailureListener {
result.error(TAG, "Failed to start document scanner", null)
consumePendingResult()?.error(TAG, "Failed to start document scanner", null)
}
}

Expand Down Expand Up @@ -141,11 +141,11 @@ class DocumentScanner(
}

Activity.RESULT_CANCELED -> {
pendingResult?.error(TAG, "Operation cancelled", null)
consumePendingResult()?.error(TAG, "Operation cancelled", null)
}

else -> {
pendingResult?.error(TAG, "Unknown Error", null)
consumePendingResult()?.error(TAG, "Unknown Error", null)
}
}
return true
Expand All @@ -154,6 +154,8 @@ class DocumentScanner(
}

private fun handleScanningResult(result: GmsDocumentScanningResult) {
val reply = consumePendingResult() ?: return

val resultMap = HashMap<String, Any?>()

val pdf = result.pdf
Expand All @@ -174,6 +176,18 @@ class DocumentScanner(
resultMap["images"] = null
}

pendingResult?.success(resultMap)
reply.success(resultMap)
}

/**
* Atomically returns the current [pendingResult] and clears the field, so a subsequent
* duplicate callback (e.g. a redelivered activity result on some OEM builds) cannot submit
* a second reply on the same [MethodChannel.Result] and trigger
* `IllegalStateException: Reply already submitted`.
*/
private fun consumePendingResult(): MethodChannel.Result? {
val reply = pendingResult
pendingResult = null
return reply
}
}
Loading