Add purchase flow test flag

Author: rostikjoystick

app/src/main/java/org/stepic/droid/configuration/RemoteConfig.kt

@@ -13,10 +13,8 @@ object RemoteConfig {
     const val PERSONALIZED_ONBOARDING_COURSE_LISTS = "personalized_onboarding_course_lists"
     const val IS_COURSE_REVENUE_AVAILABLE_ANDROID = "is_course_revenue_available_android"
     const val PURCHASE_FLOW_ANDROID = "purchase_flow_android"
+    const val PURCHASE_FLOW_ANDROID_TEST = "purchase_flow_android_test"
     const val PURCHASE_FLOW_DISCLAIMER_EN = "purchase_flow_android_disclaimer_en"
     const val PURCHASE_FLOW_DISCLAIMER_RU = "purchase_flow_android_disclaimer_ru"
     const val PURCHASE_FLOW_DISCLAIMER_BE = "purchase_flow_android_disclaimer_be"
-
-    // TODO APPS-3443: Remove after finishing feature
-    const val PURCHASE_FLOW_ANDROID_TESTING_FLAG = false
 }

app/src/main/java/org/stepik/android/domain/course/interactor/CourseInteractor.kt

@@ -57,13 +57,13 @@ constructor(
 
     private fun obtainCourseHeaderData(course: Course, promo: String? = null): Maybe<CourseHeaderData> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
                 .asString()
                 .uppercase()
         )
 
         val isInAppActive =
-            currentFlow.isInAppActive() || RemoteConfig.PURCHASE_FLOW_ANDROID_TESTING_FLAG
+            currentFlow.isInAppActive()
 
         return zip(
             if (isInAppActive) {

app/src/main/java/org/stepik/android/domain/course/interactor/CourseStatsInteractor.kt

@@ -48,12 +48,12 @@ constructor(
 
     fun checkDeeplinkPromoCodeValidity(courseId: Long, promo: String): Single<Pair<DeeplinkPromoCode, PromoCodeSku>> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
                 .asString()
                 .uppercase()
         )
 
-        val isInAppActive = currentFlow.isInAppActive() || RemoteConfig.PURCHASE_FLOW_ANDROID_TESTING_FLAG
+        val isInAppActive = currentFlow.isInAppActive()
 
         return coursePaymentsRepository
             .checkDeeplinkPromoCodeValidity(courseId, promo)
@@ -232,7 +232,7 @@ constructor(
     private fun resolvePaidEnrollmentState(standardLightSku: LightSku?, promoLightSku: LightSku?): EnrollmentState =
         if (standardLightSku == null) {
             val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
+                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
                     .asString()
                     .uppercase()
             )

app/src/main/java/org/stepik/android/domain/course_list/interactor/CourseListInteractor.kt

@@ -68,12 +68,12 @@ constructor(
         sourceTypeComposition: SourceTypeComposition
     ): Single<PagedList<CourseListItem.Data>> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
                 .asString()
                 .uppercase()
         )
 
-        val isInAppActive = currentFlow.isInAppActive() || RemoteConfig.PURCHASE_FLOW_ANDROID_TESTING_FLAG
+        val isInAppActive = currentFlow.isInAppActive()
 
         return if (isInAppActive) {
             mapCourseStats(

app/src/main/java/org/stepik/android/domain/lesson_demo/interactor/LessonDemoInteractor.kt

@@ -28,13 +28,13 @@ constructor(
 ) {
     fun getLessonDemoData(course: Course): Single<LessonDemoData> {
         val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
+            firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
                 .asString()
                 .uppercase()
         )
 
         val isInAppActive =
-            currentFlow.isInAppActive() || RemoteConfig.PURCHASE_FLOW_ANDROID_TESTING_FLAG
+            currentFlow.isInAppActive()
 
         val deeplinkPromoCode = coursePurchaseDataRepository.getDeeplinkPromoCode()
         val initialCoursePurchaseDataResult = coursePurchaseDataRepository.getCoursePurchaseData()

app/src/main/java/org/stepik/android/view/lesson_demo/ui/dialog/LessonDemoCompleteBottomSheetDialogFragment.kt

@@ -114,13 +114,13 @@ class LessonDemoCompleteBottomSheetDialogFragment :
     override fun onAction(action: LessonDemoFeature.Action.ViewAction) {
         if (action is LessonDemoFeature.Action.ViewAction.BuyAction) {
             val currentFlow = CoursePurchaseFlow.valueOfWithFallback(
-                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID]
+                firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID_TEST]
                     .asString()
                     .uppercase()
             )
 
             val isInAppActive =
-                currentFlow.isInAppActive() || RemoteConfig.PURCHASE_FLOW_ANDROID_TESTING_FLAG
+                currentFlow.isInAppActive()
 
             if (isInAppActive && action.coursePurchaseData != null) {
                 CoursePurchaseBottomSheetDialogFragment

app/src/main/res/xml/remote_config_defaults.xml

@@ -40,6 +40,10 @@
         <key>purchase_flow_android</key>
         <value>web</value>
     </entry>
+    <entry>
+        <key>purchase_flow_android_test</key>
+        <value>web</value>
+    </entry>
     <entry>
         <key>purchase_flow_android_disclaimer_en</key>
         <value><![CDATA[The price includes commission from Google Play and VAT. By paying for access to this course you agree to the <a href="https://welcome.stepik.org/en/payment-terms">user agreement</a>.]]></value>