Skip to content

Fix Android coroutine scope cancellation causing promises to hang after React context reload #911

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
CatLover01 wants to merge 1 commit into from
Closed

Fix Android coroutine scope cancellation causing promises to hang after React context reload #911

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
24 changes: 20 additions & 4 deletions ...ment-picker/android/src/main/java/com/reactnativedocumentpicker/RNDocumentPickerModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ import com.facebook.react.bridge.ReadableMap
import com.facebook.react.bridge.WritableMap
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch

class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
Expand All @@ -32,7 +34,18 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
private val pickedFilesUriMap = mutableMapOf<String, Uri>()
private val metadataGetter = MetadataGetter(pickedFilesUriMap)
private val fileOps = FileOperations(pickedFilesUriMap)
private val fileCopyingCoroutine = CoroutineScope(Dispatchers.IO)
private var fileCopyingCoroutine = createCoroutineScope()

private fun createCoroutineScope(): CoroutineScope {
return CoroutineScope(SupervisorJob() + Dispatchers.IO)
}

private fun ensureScopeActive(): CoroutineScope {
if (!fileCopyingCoroutine.isActive) {
fileCopyingCoroutine = createCoroutineScope()
}
return fileCopyingCoroutine
}

private val activityEventListener: ActivityEventListener =
object : BaseActivityEventListener() {
Expand Down Expand Up @@ -174,7 +187,8 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
"You did not provide the correct options. Expected 'files' and 'destination', got: ${options.toHashMap().keys}"
)
}
fileCopyingCoroutine.launch {
val scope = ensureScopeActive()
val job = scope.launch {
val results = fileOps.copyFilesToLocalStorage(
reactApplicationContext,
filesToCopy,
Expand Down Expand Up @@ -257,7 +271,8 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
}

override fun writeDocuments(options: ReadableMap, promise: Promise) {
fileCopyingCoroutine.launch {
val scope = ensureScopeActive()
val job = scope.launch {
try {
val targetUriString = if (options.hasKey("uri")) options.getString("uri") else null

Expand Down Expand Up @@ -304,7 +319,8 @@ class RNDocumentPickerModule(reactContext: ReactApplicationContext) :
else -> emptyList()
}

fileCopyingCoroutine.launch {
val scope = ensureScopeActive()
val job = scope.launch {
try {
val pickOptions = currentPickOptions
require(pickOptions != null)
Expand Down