Merge pull request #256 from Automattic/update/enable-free-trial-feature-flag

Update/enable free trial feature flag

Author: ashiagr

base.gradle

@@ -31,8 +31,6 @@ android {
         buildConfigField "String", "SETTINGS_ENCRYPT_SECRET", "\"${project.properties["pocketcastsSettingsEncryptSecret"] ?: ""}\""
         buildConfigField "String", "SHARING_SERVER_SECRET", "\"${project.properties["pocketcastsSharingServerSecret"] ?: ""}\""
 
-        buildConfigField "boolean", "ENABLE_FREE_TRIAL", "false"
-
         testInstrumentationRunner project.testInstrumentationRunner
         testApplicationId "au.com.shiftyjelly.pocketcasts.test" + project.name.replace("-", "_")
         vectorDrawables.useSupportLibrary = true

modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/subscription/SubscriptionManager.kt

@@ -18,7 +18,6 @@ interface SubscriptionManager {
         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()

modules/services/repositories/src/main/java/au/com/shiftyjelly/pocketcasts/repositories/subscription/SubscriptionManagerImpl.kt

@@ -9,10 +9,8 @@ import au.com.shiftyjelly.pocketcasts.models.type.SubscriptionPlatform
 import au.com.shiftyjelly.pocketcasts.models.type.SubscriptionPricingPhase
 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
 import au.com.shiftyjelly.pocketcasts.servers.sync.SubscriptionResponse
@@ -158,16 +156,7 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
                     .setProductId(YEARLY_PRODUCT_ID)
                     .setProductType(BillingClient.ProductType.SUBS)
                     .build(),
-            ).apply {
-                if (isFreeTrialEligible()) {
-                    add(
-                        QueryProductDetailsParams.Product.newBuilder()
-                            .setProductId(TEST_FREE_TRIAL_PRODUCT_ID)
-                            .setProductType(BillingClient.ProductType.SUBS)
-                            .build()
-                    )
-                }
-            }
+            )
 
         val params = QueryProductDetailsParams.newBuilder()
             .setProductList(productList)
@@ -343,7 +332,7 @@ class SubscriptionManagerImpl @Inject constructor(private val syncServerManager:
         subscriptionStatus.accept(Optional.empty())
     }
 
-    override fun isFreeTrialEligible() = freeTrialEligible && BuildConfig.ENABLE_FREE_TRIAL
+    override fun isFreeTrialEligible() = freeTrialEligible
 
     override fun updateFreeTrialEligible(eligible: Boolean) {
         freeTrialEligible = eligible