Merge pull request #928 from StepicOrg/release/1.204

Release/1.204

Author: rostikjoystick

app/build.gradle

@@ -175,6 +175,7 @@ dependencies {
     implementation libraries.domainRx
     implementation libraries.viewInjection
     implementation libraries.viewBindingDelegate
+    implementation libraries.multisnaprecycler
 
     implementation libraries.exoPlayerCore
     implementation libraries.exoPlayerUI

app/src/debug/java/org/stepik/android/view/debug/ui/adapter/delegate/InAppPurchaseAdapterDelegate.kt

@@ -35,12 +35,6 @@ class InAppPurchaseAdapterDelegate(
 
             inAppPurchaseCourse.isVisible = data.developerPayload.isNotEmpty()
             inAppPurchaseUser.isVisible = data.developerPayload.isNotEmpty()
-            if (data.developerPayload.isNotEmpty()) {
-                data.developerPayload.toObject<CoursePurchasePayload>().let {
-                    inAppPurchaseCourse.text = context.getString(R.string.debug_purchase_course, it.courseId)
-                    inAppPurchaseUser.text = context.getString(R.string.debug_purchase_profile, it.profileId)
-                }
-            }
         }
     }
 }

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/stepic/droid/configuration/analytic/CoursePurchaseFlowProperty.kt

@@ -0,0 +1,12 @@
+package org.stepic.droid.configuration.analytic
+
+import org.stepic.droid.configuration.RemoteConfig
+import org.stepik.android.domain.base.analytic.UserProperty
+
+class CoursePurchaseFlowProperty(purchaseFlow: String) : UserProperty {
+    override val name: String =
+        RemoteConfig.PREFIX + RemoteConfig.PURCHASE_FLOW_ANDROID
+
+    override val value: String =
+        purchaseFlow
+}

app/src/main/java/org/stepic/droid/core/presenters/SplashPresenter.kt

@@ -194,6 +194,7 @@ constructor(
         analytic.reportUserProperty(NewHomeScreenEnabledUserProperty(firebaseRemoteConfig[RemoteConfig.IS_NEW_HOME_SCREEN_ENABLED].asBoolean()))
         analytic.reportUserProperty(PersonalizedOnboardingCourseListsUserProperty(firebaseRemoteConfig[RemoteConfig.PERSONALIZED_ONBOARDING_COURSE_LISTS].asString()))
         analytic.reportUserProperty(CourseRevenueAvailableUserProperty(firebaseRemoteConfig[RemoteConfig.IS_COURSE_REVENUE_AVAILABLE_ANDROID].asBoolean()))
+        analytic.reportUserProperty(CoursePurchaseFlowProperty(firebaseRemoteConfig[RemoteConfig.PURCHASE_FLOW_ANDROID].asString()))
     }
 
     private fun countNumberOfLaunches() {

app/src/main/java/org/stepic/droid/storage/migration/MigrationFrom77To78.kt

@@ -0,0 +1,10 @@
+package org.stepic.droid.storage.migration
+
+import androidx.room.migration.Migration
+import androidx.sqlite.db.SupportSQLiteDatabase
+
+object MigrationFrom77To78 : Migration(77, 78) {
+    override fun migrate(db: SupportSQLiteDatabase) {
+        db.execSQL("CREATE TABLE IF NOT EXISTS `BillingPurchasePayload` (`orderId` TEXT NOT NULL, `courseId` INTEGER NOT NULL, `profileId` INTEGER NOT NULL, `obfuscatedAccountId` TEXT NOT NULL, `obfuscatedProfileId` TEXT NOT NULL, `promoCode` TEXT, PRIMARY KEY(`orderId`))")
+    }
+}

app/src/main/java/org/stepic/droid/storage/migration/Migrations.kt

@@ -208,6 +208,7 @@ object Migrations {
         MigrationFrom73To74,
         MigrationFrom74To75,
         MigrationFrom75To76,
-        MigrationFrom76To77
+        MigrationFrom76To77,
+        MigrationFrom77To78
     )
 }

app/src/main/java/org/stepic/droid/ui/fragments/AboutAppFragment.kt

@@ -7,6 +7,7 @@ import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.GridLayoutManager
 import kotlinx.android.synthetic.main.fragment_about_app.*
+import org.stepic.droid.BuildConfig
 import org.stepic.droid.R
 import org.stepic.droid.analytic.Analytic
 import org.stepic.droid.base.FragmentBase
@@ -35,6 +36,8 @@ class AboutAppFragment : FragmentBase() {
             analytic.reportEvent(Analytic.Interaction.CLICK_TERMS_OF_SERVICE)
             screenManager.openTermsOfServiceWeb(activity)
         }
+
+        appVersionName.text = getString(R.string.settings_app_version, BuildConfig.VERSION_NAME)
         initSocialRecycler()
     }
 

app/src/main/java/org/stepik/android/cache/base/database/AppDatabase.kt

@@ -18,13 +18,15 @@ import org.stepik.android.domain.catalog.model.CatalogBlock
 import org.stepik.android.domain.review_instruction.model.ReviewInstruction
 import org.stepik.android.domain.review_session.model.ReviewSession
 import org.stepik.android.cache.code_preference.model.CodePreference
+import org.stepik.android.cache.course_purchase.dao.BillingPurchasePayloadDao
 import org.stepik.android.cache.course_recommendations.dao.CourseRecommendationsDao
 import org.stepik.android.cache.exam_session.dao.ExamSessionDao
 import org.stepik.android.cache.mobile_tiers.dao.LightSkuDao
 import org.stepik.android.cache.mobile_tiers.dao.MobileTiersDao
 import org.stepik.android.cache.proctor_session.dao.ProctorSessionDao
 import org.stepik.android.cache.rubric.dao.RubricDao
 import org.stepik.android.cache.wishlist.dao.WishlistDao
+import org.stepik.android.domain.course_purchase.model.BillingPurchasePayload
 import org.stepik.android.domain.course_recommendations.model.CourseRecommendation
 import org.stepik.android.domain.exam_session.model.ExamSession
 import org.stepik.android.domain.mobile_tiers.model.LightSku
@@ -48,7 +50,8 @@ import org.stepik.android.domain.wishlist.model.WishlistEntry
         ProctorSession::class,
         MobileTier::class,
         LightSku::class,
-        WishlistEntry::class
+        WishlistEntry::class,
+        BillingPurchasePayload::class
     ],
     version = AppDatabase.VERSION,
     exportSchema = false
@@ -62,7 +65,7 @@ import org.stepik.android.domain.wishlist.model.WishlistEntry
 )
 abstract class AppDatabase : RoomDatabase() {
     companion object {
-        const val VERSION = 77
+        const val VERSION = 78
         const val NAME = "stepic_database.db"
     }
 
@@ -79,4 +82,5 @@ abstract class AppDatabase : RoomDatabase() {
     abstract fun mobileTiersDao(): MobileTiersDao
     abstract fun lightSkuDao(): LightSkuDao
     abstract fun wishlistDao(): WishlistDao
+    abstract fun billingPurchasePayloadDao(): BillingPurchasePayloadDao
 }

app/src/main/java/org/stepik/android/cache/course_purchase/BillingPurchasePayloadCacheDataSourceImpl.kt

@@ -0,0 +1,23 @@
+package org.stepik.android.cache.course_purchase
+
+import io.reactivex.Completable
+import io.reactivex.Single
+import org.stepik.android.cache.course_purchase.dao.BillingPurchasePayloadDao
+import org.stepik.android.data.course_purchase.source.BillingPurchasePayloadCacheDataSource
+import org.stepik.android.domain.course_purchase.model.BillingPurchasePayload
+import javax.inject.Inject
+
+class BillingPurchasePayloadCacheDataSourceImpl
+@Inject
+constructor(
+    private val billingPurchasePayloadDao: BillingPurchasePayloadDao
+) : BillingPurchasePayloadCacheDataSource {
+    override fun getPurchaseOrderPayload(orderId: String): Single<BillingPurchasePayload> =
+        billingPurchasePayloadDao.getBillingPurchasePayload(orderId)
+
+    override fun savePurchaseOrderPayload(billingPurchasePayload: BillingPurchasePayload): Completable =
+        billingPurchasePayloadDao.saveBillingPurchasePayload(billingPurchasePayload)
+
+    override fun deletePurchaseOrderPayload(orderId: String): Completable =
+        billingPurchasePayloadDao.deleteBillingPurchasePayload(orderId)
+}