Skip to content

Avoid unscoped coroutine leakage in getSecureWalletInfo() (cancel on … #61

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
MegaManSec wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Avoid unscoped coroutine leakage in getSecureWalletInfo() (cancel on … #61

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
6 changes: 5 additions & 1 deletion android/src/main/java/com/expensify/wallet/WalletModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import com.google.android.gms.tapandpay.issuer.PushTokenizeRequest
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.SupervisorJob
import kotlinx.coroutines.cancel
import com.expensify.wallet.Utils.getAsyncResult
import com.expensify.wallet.Utils.toCardData
import com.expensify.wallet.error.InvalidNetworkError
Expand Down Expand Up @@ -50,6 +52,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :
private val tapAndPayClient: TapAndPayClient = TapAndPay.getClient(activity)
private var pendingCreateWalletPromise: Promise? = null
private var pendingPushTokenizePromise: Promise? = null
private val moduleScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)

override fun initialize() {
super.initialize()
Expand All @@ -58,6 +61,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :

override fun invalidate() {
super.invalidate()
moduleScope.cancel()
reactApplicationContext.removeActivityEventListener(cardListener)
}

Expand Down Expand Up @@ -119,7 +123,7 @@ class WalletModule internal constructor(context: ReactApplicationContext) :

@ReactMethod
override fun getSecureWalletInfo(promise: Promise) {
CoroutineScope(Dispatchers.Main).launch {
moduleScope.launch {
try {
val walletId = getWalletIdAsync()
val hardwareId = getHardwareIdAsync()
Expand Down