ISSUE-1765: Make suspend coroutine wrappers cancellable

RevenueCat · Aug 7, 2024 · 219893a · 219893a
1 parent f8ee985
commit 219893a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/purchases/src/defaults/kotlin/com/revenuecat/purchases/coroutinesExtensions.kt b/purchases/src/defaults/kotlin/com/revenuecat/purchases/coroutinesExtensions.kt
@@ -4,7 +4,7 @@ import com.revenuecat.purchases.CacheFetchPolicy.CACHED_OR_FETCHED
 import com.revenuecat.purchases.data.LogInResult
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
+import kotlin.coroutines.suspendCancellableCoroutine
 
 /**
  * Get latest available customer info.
@@ -21,7 +21,7 @@ import kotlin.coroutines.suspendCoroutine
 suspend fun Purchases.awaitCustomerInfo(
     fetchPolicy: CacheFetchPolicy = CacheFetchPolicy.default(),
 ): CustomerInfo {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         getCustomerInfoWith(
             fetchPolicy,
             onSuccess = continuation::resume,
@@ -43,7 +43,7 @@ suspend fun Purchases.awaitCustomerInfo(
 @JvmSynthetic
 @Throws(PurchasesTransactionException::class)
 suspend fun Purchases.awaitLogIn(appUserID: String): LogInResult {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         logInWith(
             appUserID,
             onSuccess = { customerInfo, created ->
@@ -66,7 +66,7 @@ suspend fun Purchases.awaitLogIn(appUserID: String): LogInResult {
 @JvmSynthetic
 @Throws(PurchasesTransactionException::class)
 suspend fun Purchases.awaitLogOut(): CustomerInfo {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         logOutWith(
             onSuccess = { continuation.resume(it) },
             onError = { continuation.resumeWithException(PurchasesException(it)) },
@@ -87,7 +87,7 @@ suspend fun Purchases.awaitLogOut(): CustomerInfo {
 @JvmSynthetic
 @Throws(PurchasesException::class)
 suspend fun Purchases.awaitSyncPurchases(): CustomerInfo {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         syncPurchasesWith(
             onSuccess = continuation::resume,
             onError = { continuation.resumeWithException(PurchasesException(it)) },
@@ -114,7 +114,7 @@ suspend fun Purchases.awaitSyncPurchases(): CustomerInfo {
 @JvmSynthetic
 @Throws(PurchasesException::class)
 suspend fun Purchases.awaitSyncAttributesAndOfferingsIfNeeded(): Offerings {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         syncAttributesAndOfferingsIfNeededWith(
             onSuccess = continuation::resume,
             onError = { continuation.resumeWithException(PurchasesException(it)) },
@@ -140,7 +140,7 @@ suspend fun Purchases.awaitSyncAttributesAndOfferingsIfNeeded(): Offerings {
 @JvmSynthetic
 @Throws(PurchasesException::class)
 suspend fun Purchases.getAmazonLWAConsentStatus(): AmazonLWAConsentStatus {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         getAmazonLWAConsentStatusWith(
             onSuccess = continuation::resume,
             onError = { continuation.resumeWithException(PurchasesException(it)) },

diff --git a/purchases/src/main/kotlin/com/revenuecat/purchases/CoroutinesExtensionsCommon.kt b/purchases/src/main/kotlin/com/revenuecat/purchases/CoroutinesExtensionsCommon.kt
@@ -2,9 +2,9 @@ package com.revenuecat.purchases
 
 import com.revenuecat.purchases.models.StoreProduct
 import com.revenuecat.purchases.models.StoreTransaction
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 import kotlin.coroutines.resumeWithException
-import kotlin.coroutines.suspendCoroutine
 
 /**
  * Fetch the configured offerings for this users. Offerings allows you to configure your in-app
@@ -22,7 +22,7 @@ import kotlin.coroutines.suspendCoroutine
 @JvmSynthetic
 @Throws(PurchasesException::class)
 suspend fun Purchases.awaitOfferings(): Offerings {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         getOfferingsWith(
             onSuccess = continuation::resume,
             onError = { continuation.resumeWithException(PurchasesException(it)) },
@@ -49,7 +49,7 @@ suspend fun Purchases.awaitOfferings(): Offerings {
 @JvmSynthetic
 @Throws(PurchasesTransactionException::class)
 suspend fun Purchases.awaitPurchase(purchaseParams: PurchaseParams): PurchaseResult {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         purchase(
             purchaseParams = purchaseParams,
             callback = purchaseCompletedCallback(
@@ -82,7 +82,7 @@ suspend fun Purchases.awaitGetProducts(
     productIds: List<String>,
     type: ProductType? = null,
 ): List<StoreProduct> {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         getProductsWith(
             productIds,
             type,
@@ -113,7 +113,7 @@ suspend fun Purchases.awaitGetProducts(
 @JvmSynthetic
 @Throws(PurchasesTransactionException::class)
 suspend fun Purchases.awaitRestore(): CustomerInfo {
-    return suspendCoroutine { continuation ->
+    return suspendCancellableCoroutine { continuation ->
         restorePurchasesWith(
             onSuccess = { continuation.resume(it) },
             onError = { continuation.resumeWithException(PurchasesException(it)) },

diff --git a/...catui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/HelperFunctions.kt b/...catui/src/main/kotlin/com/revenuecat/purchases/ui/revenuecatui/helpers/HelperFunctions.kt
@@ -11,6 +11,7 @@ import com.revenuecat.purchases.CustomerInfo
 import com.revenuecat.purchases.Purchases
 import com.revenuecat.purchases.PurchasesException
 import com.revenuecat.purchases.getCustomerInfoWith
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlin.coroutines.resume
 import kotlin.coroutines.suspendCoroutine
 
@@ -35,7 +36,7 @@ internal fun windowAspectRatio(): Float {
  * Evaluates [shouldDisplayBlock] with the current CustomerInfo to determine if a paywall should be displayed.
  */
 internal suspend fun shouldDisplayPaywall(shouldDisplayBlock: (CustomerInfo) -> Boolean): Boolean {
-    return suspendCoroutine { continuation -> shouldDisplayPaywall(shouldDisplayBlock, continuation::resume) }
+    return suspendCancellableCoroutine { continuation -> shouldDisplayPaywall(shouldDisplayBlock, continuation::resume) }
 }
 
 /**