Implement new argument in purchase() method in SubscriptionsManager

duckduckgo · Jan 24, 2025 · 258f1d0 · 258f1d0
1 parent 00dee76
commit 258f1d0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/...ubscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt b/...ubscriptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/SubscriptionsManager.kt
@@ -105,11 +105,12 @@ interface SubscriptionsManager {
     suspend fun getSubscriptionOffer(): List<SubscriptionOffer>
 
     /**
-     * Launches the purchase flow for a given plan id
+     * Launches the purchase flow for a given combination of plan id and offer id
      */
     suspend fun purchase(
         activity: Activity,
         planId: String,
+        offerId: String? = null,
     )
 
     /**
@@ -747,6 +748,7 @@ class RealSubscriptionsManager @Inject constructor(
     override suspend fun purchase(
         activity: Activity,
         planId: String,
+        offerId: String?,
     ) {
         try {
             _currentPurchaseState.emit(CurrentPurchase.PreFlowInProgress)

diff --git a/...ptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/billing/PlayBillingManager.kt b/...ptions-impl/src/main/java/com/duckduckgo/subscriptions/impl/billing/PlayBillingManager.kt
@@ -75,6 +75,7 @@ interface PlayBillingManager {
         activity: Activity,
         planId: String,
         externalId: String,
+        offerId: String? = null,
     )
 }
 
@@ -173,6 +174,7 @@ class RealPlayBillingManager @Inject constructor(
         activity: Activity,
         planId: String,
         externalId: String,
+        offerId: String?,
     ) = withContext(dispatcherProvider.io()) {
         if (!billingClient.ready) {
             logcat { "Service not ready" }
@@ -183,7 +185,7 @@ class RealPlayBillingManager @Inject constructor(
 
         val offerToken = productDetails
             ?.subscriptionOfferDetails
-            ?.find { it.basePlanId == planId }
+            ?.find { it.basePlanId == planId && it.offerId == offerId }
             ?.offerToken
 
         if (productDetails == null || offerToken == null) {