Merge pull request #255 from Automattic/update/free-trial-eligibility…

…-using-purchase-history Update/free trial eligibility based on purchase history
Automattic · Aug 22, 2022 · 0c746b7 · 0c746b7
2 parents 5fd062e + 04f142c
commit 0c746b7
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 13 deletions.
diff --git a/...s/account/src/main/java/au/com/shiftyjelly/pocketcasts/account/CreateFrequencyFragment.kt b/...s/account/src/main/java/au/com/shiftyjelly/pocketcasts/account/CreateFrequencyFragment.kt
@@ -84,7 +84,7 @@ class CreateFrequencyFragment : BaseFragment() {
                     title = subscription.productDetails.title,
                     price = subscription.recurringPricingPhase.pricingPhase.priceAmountMicros * 1_000_000.0,
                     currency = subscription.recurringPricingPhase.pricingPhase.priceCurrencyCode,
-                    isFreeTrial = subscriptionManager.isFreeTrialEnabled() && subscription is Subscription.WithTrial
+                    isFreeTrial = subscription is Subscription.WithTrial
                 )
                 it.findNavController().navigate(R.id.action_createFrequencyFragment_to_createTOSFragment)
             }

diff --git a/.../src/main/java/au/com/shiftyjelly/pocketcasts/account/viewmodel/CreateAccountViewModel.kt b/.../src/main/java/au/com/shiftyjelly/pocketcasts/account/viewmodel/CreateAccountViewModel.kt
@@ -43,7 +43,12 @@ class CreateAccountViewModel
                 onSuccess = { productDetailsState ->
                     if (productDetailsState is ProductDetailsState.Loaded) {
                         val subscriptions = productDetailsState.productDetails
-                            .mapNotNull { Subscription.fromProductDetails(it) }
+                            .mapNotNull {
+                                Subscription.fromProductDetails(
+                                    productDetails = it,
+                                    isFreeTrialEligible = subscriptionManager.isFreeTrialEligible()
+                                )
+                            }
                         subscriptionManager.getDefaultSubscription(subscriptions)?.let { updateSubscription(it) }
                         createAccountState.postValue(CreateAccountState.ProductsLoaded(subscriptions))
                     } else {

diff --git a/...s/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsViewModel.kt b/...s/profile/src/main/java/au/com/shiftyjelly/pocketcasts/profile/AccountDetailsViewModel.kt
@@ -43,7 +43,12 @@ class AccountDetailsViewModel
     private val subscription = subscriptionManager.observeProductDetails().map { state ->
         if (state is ProductDetailsState.Loaded) {
             val subscriptions = state.productDetails
-                .mapNotNull { Subscription.fromProductDetails(it) }
+                .mapNotNull {
+                    Subscription.fromProductDetails(
+                        productDetails = it,
+                        isFreeTrialEligible = subscriptionManager.isFreeTrialEligible()
+                    )
+                }
             Optional.of(subscriptionManager.getDefaultSubscription(subscriptions))
         } else {
             Optional.empty()

diff --git a/...es/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/PlusSettingsFragment.kt b/...es/settings/src/main/java/au/com/shiftyjelly/pocketcasts/settings/PlusSettingsFragment.kt
@@ -51,7 +51,10 @@ class PlusSettingsFragment : BaseFragment() {
             val subscriptions = when (productDetailsState) {
                 is ProductDetailsState.Error -> null
                 is ProductDetailsState.Loaded -> productDetailsState.productDetails.mapNotNull {
-                    Subscription.fromProductDetails(it)
+                    Subscription.fromProductDetails(
+                        productDetails = it,
+                        isFreeTrialEligible = subscriptionManager.isFreeTrialEligible()
+                    )
                 }
             }
 

diff --git a/...rc/main/java/au/com/shiftyjelly/pocketcasts/settings/viewmodel/UpgradeAccountViewModel.kt b/...rc/main/java/au/com/shiftyjelly/pocketcasts/settings/viewmodel/UpgradeAccountViewModel.kt
@@ -23,7 +23,12 @@ class UpgradeAccountViewModel
     private val productDetails = subscriptionManager.observeProductDetails().map { productDetailsState ->
         if (productDetailsState is ProductDetailsState.Loaded) {
             val subscriptions = productDetailsState.productDetails
-                .mapNotNull { Subscription.fromProductDetails(it) }
+                .mapNotNull {
+                    Subscription.fromProductDetails(
+                        productDetails = it,
+                        isFreeTrialEligible = subscriptionManager.isFreeTrialEligible()
+                    )
+                }
             val productState = when (val subscription = subscriptionManager.getDefaultSubscription(subscriptions)) {
                 null -> null
                 is Subscription.WithTrial -> ProductState.ProductWithTrial(

diff --git a/...s/services/model/src/main/java/au/com/shiftyjelly/pocketcasts/models/type/Subscription.kt b/...s/services/model/src/main/java/au/com/shiftyjelly/pocketcasts/models/type/Subscription.kt
@@ -46,7 +46,7 @@ sealed interface Subscription {
     }
 
     companion object {
-        fun fromProductDetails(productDetails: ProductDetails): Subscription? {
+        fun fromProductDetails(productDetails: ProductDetails, isFreeTrialEligible: Boolean): Subscription? {
 
             val recurringPhase = productDetails.recurringSubscriptionPricingPhase?.fromPricingPhase()
             val trialPhase = productDetails.trialSubscriptionPricingPhase?.fromPricingPhase()
@@ -57,7 +57,7 @@ sealed interface Subscription {
                     LogBuffer.e(LogBuffer.TAG_SUBSCRIPTIONS, "unable to convert product details to a subscription")
                     null
                 }
-                trialPhase is TrialSubscriptionPricingPhase -> WithTrial(
+                trialPhase is TrialSubscriptionPricingPhase && isFreeTrialEligible -> WithTrial(
                     recurringPricingPhase = recurringPhase,
                     trialPricingPhase = trialPhase,
                     productDetails = productDetails

diff --git a/...main/java/au/com/shiftyjelly/pocketcasts/repositories/subscription/SubscriptionManager.kt b/...main/java/au/com/shiftyjelly/pocketcasts/repositories/subscription/SubscriptionManager.kt
@@ -15,9 +15,10 @@ import io.reactivex.Single
 interface SubscriptionManager {
 
     companion object {
-        const val MONTHLY_PRODUCT_ID = "com.pocketcasts.plus.monthly"
-        const val YEARLY_PRODUCT_ID = "com.pocketcasts.plus.yearly"
-        const val TEST_FREE_TRIAL_PRODUCT_ID = "com.pocketcasts.plus.testfreetrialoffer"
+        const val PLUS_PRODUCT_BASE = "com.pocketcasts.plus"
+        const val MONTHLY_PRODUCT_ID = "$PLUS_PRODUCT_BASE.monthly"
+        const val YEARLY_PRODUCT_ID = "$PLUS_PRODUCT_BASE.yearly"
+        const val TEST_FREE_TRIAL_PRODUCT_ID = "$PLUS_PRODUCT_BASE.testfreetrialoffer"
     }
 
     fun signOut()
@@ -37,6 +38,7 @@ interface SubscriptionManager {
     fun launchBillingFlow(activity: Activity, productDetails: ProductDetails): BillingResult?
     fun getCachedStatus(): SubscriptionStatus?
     fun clearCachedStatus()
-    fun isFreeTrialEnabled(): Boolean
+    fun isFreeTrialEligible(): Boolean
+    fun updateFreeTrialEligible(eligible: Boolean)
     fun getDefaultSubscription(subscriptions: List<Subscription>): Subscription?
 }
diff --git a/.../java/au/com/shiftyjelly/pocketcasts/repositories/subscription/SubscriptionManagerImpl.kt b/.../java/au/com/shiftyjelly/pocketcasts/repositories/subscription/SubscriptionManagerImpl.kt
@@ -11,6 +11,7 @@ import au.com.shiftyjelly.pocketcasts.models.type.SubscriptionType
 import au.com.shiftyjelly.pocketcasts.preferences.Settings
 import au.com.shiftyjelly.pocketcasts.repositories.BuildConfig
 import au.com.shiftyjelly.pocketcasts.repositories.subscription.SubscriptionManager.Companion.MONTHLY_PRODUCT_ID
+import au.com.shiftyjelly.pocketcasts.repositories.subscription.SubscriptionManager.Companion.PLUS_PRODUCT_BASE
 import au.com.shiftyjelly.pocketcasts.repositories.subscription.SubscriptionManager.Companion.TEST_FREE_TRIAL_PRODUCT_ID
 import au.com.shiftyjelly.pocketcasts.repositories.subscription.SubscriptionManager.Companion.YEARLY_PRODUCT_ID
 import au.com.shiftyjelly.pocketcasts.servers.sync.SubscriptionPurchaseRequest
@@ -31,6 +32,7 @@ import com.android.billingclient.api.Purchase
 import com.android.billingclient.api.PurchasesResult
 import com.android.billingclient.api.PurchasesUpdatedListener
 import com.android.billingclient.api.QueryProductDetailsParams
+import com.android.billingclient.api.QueryPurchaseHistoryParams
 import com.android.billingclient.api.QueryPurchasesParams
 import com.android.billingclient.api.queryPurchasesAsync
 import com.jakewharton.rxrelay2.BehaviorRelay
@@ -72,6 +74,7 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
     private val productDetails = BehaviorRelay.create<ProductDetailsState>()
     private val purchaseEvents = PublishRelay.create<PurchaseEvent>()
     private val subscriptionChangedEvents = PublishRelay.create<SubscriptionChangedEvent>()
+    private var freeTrialEligible: Boolean = true
 
     override fun signOut() {
         clearCachedStatus()
@@ -156,7 +159,7 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
                     .setProductType(BillingClient.ProductType.SUBS)
                     .build(),
             ).apply {
-                if (isFreeTrialEnabled()) {
+                if (isFreeTrialEligible()) {
                     add(
                         QueryProductDetailsParams.Product.newBuilder()
                             .setProductId(TEST_FREE_TRIAL_PRODUCT_ID)
@@ -247,6 +250,7 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
                             .build()
                         billingClient.acknowledgePurchase(acknowledgePurchaseParams, this@SubscriptionManagerImpl)
                     }
+                    updateFreeTrialEligible(false)
                     AnalyticsHelper.plusPurchased()
                 } catch (e: Exception) {
                     LogBuffer.e(LogBuffer.TAG_SUBSCRIPTIONS, e, "Could not send purchase info")
@@ -272,6 +276,8 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
     override fun refreshPurchases() {
         if (!billingClient.isReady) return
 
+        updateFreeTrialEligibilityIfPurchaseHistoryExists()
+
         val queryPurchasesParams = QueryPurchasesParams.newBuilder()
             .setProductType(BillingClient.ProductType.SUBS)
             .build()
@@ -284,6 +290,18 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
         }
     }
 
+    private fun updateFreeTrialEligibilityIfPurchaseHistoryExists() {
+        val queryPurchaseHistoryParams = QueryPurchaseHistoryParams.newBuilder()
+            .setProductType(BillingClient.ProductType.SUBS)
+            .build()
+
+        billingClient.queryPurchaseHistoryAsync(queryPurchaseHistoryParams) { _, purchases ->
+            if (purchases?.any { it.products.toString().contains(PLUS_PRODUCT_BASE) } == true) {
+                updateFreeTrialEligible(false)
+            }
+        }
+    }
+
     override suspend fun getPurchases(): PurchasesResult? {
         if (!billingClient.isReady) return null
 
@@ -325,7 +343,11 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
         subscriptionStatus.accept(Optional.empty())
     }
 
-    override fun isFreeTrialEnabled() = BuildConfig.ENABLE_FREE_TRIAL
+    override fun isFreeTrialEligible() = freeTrialEligible && BuildConfig.ENABLE_FREE_TRIAL
+
+    override fun updateFreeTrialEligible(eligible: Boolean) {
+        freeTrialEligible = eligible
+    }
 
     override fun getDefaultSubscription(subscriptions: List<Subscription>): Subscription? {
         val trialsIfPresent = subscriptions