Merge pull request #540 from qonversion/release/6.3.0

Release 6.3.0

Author: suriksarkisyan

app/src/main/java/com/qonversion/android/app/HomeFragment.kt

@@ -34,7 +34,7 @@ private const val TAG = "HomeFragment"
 class HomeFragment : Fragment() {
     lateinit var binding: FragmentHomeBinding
 
-    private val productIdSubs = "main"
+    private val productIdSubs = "weekly"
     private val productIdInApp = "in_app"
     private val entitlementPlus = "plus"
     private val entitlementStandart = "standart"

build.gradle

@@ -6,7 +6,7 @@ import io.gitlab.arturbosch.detekt.DetektCreateBaselineTask
 buildscript {
     ext {
         release = [
-                versionName: "6.2.0",
+                versionName: "6.3.0",
                 versionCode: 1
         ]
     }

config/detekt/baseline.xml

@@ -386,6 +386,7 @@
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QDateAdapter$@ToJson private fun toJson(date: Date): Long</ID>
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QEligibilityAdapter$@ToJson private fun toJson( @Suppress("UNUSED_PARAMETER") eligibilities: Map&lt;String, QEligibility&gt; ): List&lt;ProductEligibility&gt;</ID>
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QEligibilityStatusAdapter$@ToJson private fun toJson(enum: QIntroEligibilityStatus): String</ID>
+    <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QEntitlementGrantTypeAdapter$@ToJson private fun toJson(enum: QEntitlementGrantType): String</ID>
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QEntitlementSourceAdapter$@ToJson private fun toJson(enum: QEntitlementSource): String</ID>
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QExperimentGroupTypeAdapter$@ToJson private fun toJson(enum: QExperimentGroupType): String</ID>
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QOfferingTagAdapter$@ToJson private fun toJson(enum: QOfferingTag): Int?</ID>
@@ -397,6 +398,9 @@
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QProductsAdapter$@ToJson private fun toJson(products: Map&lt;String, QProduct&gt;): List&lt;QProduct&gt;</ID>
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QRemoteConfigurationSourceAssignmentTypeAdapter$@ToJson private fun toJson(enum: QRemoteConfigurationAssignmentType): String</ID>
     <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QRemoteConfigurationSourceTypeAdapter$@ToJson private fun toJson(enum: QRemoteConfigurationSourceType): String</ID>
+    <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QTransactionEnvironmentAdapter$@ToJson private fun toJson(enum: QTransactionEnvironment): String</ID>
+    <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QTransactionOwnershipTypeAdapter$@ToJson private fun toJson(enum: QTransactionOwnershipType): String</ID>
+    <ID>UnusedPrivateMember:QonversionMappingAdapters.kt$QTransactionTypeAdapter$@ToJson private fun toJson(enum: QTransactionType): String</ID>
     <ID>UtilityClassWithPublicConstructor:util.kt$Util</ID>
     <ID>WildcardImport:AdvertisingProvider.kt$import android.os.*</ID>
     <ID>WildcardImport:BillingService.kt$import com.android.billingclient.api.*</ID>

fastlane/report.xml

@@ -5,7 +5,7 @@
 
 
 
-      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.104731">
+      <testcase classname="fastlane.lanes" name="0: default_platform" time="0.017216">
 
       </testcase>
 

sdk/src/main/java/com/qonversion/android/sdk/dto/entitlements/QEntitlement.kt

@@ -10,7 +10,15 @@ data class QEntitlement(
     internal val active: Boolean,
     val source: QEntitlementSource,
     val productId: String,
-    val renewState: QEntitlementRenewState
+    val renewState: QEntitlementRenewState,
+    val renewsCount: Int,
+    val trialStartDate: Date?,
+    val firstPurchaseDate: Date?,
+    val lastPurchaseDate: Date?,
+    val lastActivatedOfferCode: String?,
+    val grantType: QEntitlementGrantType,
+    val autoRenewDisableDate: Date?,
+    val transactions: List<QTransaction>
 ) {
     internal constructor(permission: QPermission) : this(
         permission.permissionID,
@@ -19,7 +27,15 @@ data class QEntitlement(
         permission.isActive(),
         permission.source,
         permission.productID,
-        QEntitlementRenewState.fromProductRenewState(permission.renewState)
+        QEntitlementRenewState.fromProductRenewState(permission.renewState),
+        permission.renewsCount,
+        permission.trialStartDate,
+        permission.firstPurchaseDate,
+        permission.lastPurchaseDate,
+        permission.lastActivatedOfferCode,
+        permission.grantType,
+        permission.autoRenewDisableDate,
+        permission.transactions
     )
 
     val isActive get() = active

sdk/src/main/java/com/qonversion/android/sdk/dto/entitlements/QEntitlementGrantType.kt

@@ -0,0 +1,20 @@
+package com.qonversion.android.sdk.dto.entitlements
+
+enum class QEntitlementGrantType(val type: String) {
+    Purchase("purchase"),
+    FamilySharing("family_sharing"),
+    Manual("manual"),
+    OfferCode("offer_code");
+
+    companion object {
+        internal fun fromType(type: String): QEntitlementGrantType {
+            return when (type) {
+                "purchase" -> Purchase
+                "family_sharing" -> FamilySharing
+                "manual" -> Manual
+                "offerCode" -> OfferCode
+                else -> Purchase
+            }
+        }
+    }
+}

sdk/src/main/java/com/qonversion/android/sdk/dto/entitlements/QTransaction.kt

@@ -0,0 +1,18 @@
+package com.qonversion.android.sdk.dto.entitlements
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+import java.util.Date
+
+@JsonClass(generateAdapter = true)
+data class QTransaction(
+    @Json(name = "original_transaction_id") val originalTransactionId: String,
+    @Json(name = "transaction_id") val transactionId: String,
+    @Json(name = "offer_code") val offerCode: String?,
+    @Json(name = "transaction_timestamp") val transactionDate: Date,
+    @Json(name = "expiration_timestamp") val expirationDate: Date?,
+    @Json(name = "transaction_revoke_timestamp") val transactionRevocationDate: Date?,
+    @Json(name = "ownership_type") val ownershipType: QTransactionOwnershipType,
+    @Json(name = "type") val type: QTransactionType,
+    @Json(name = "environment") val environment: QTransactionEnvironment,
+)

sdk/src/main/java/com/qonversion/android/sdk/dto/entitlements/QTransactionEnvironment.kt

@@ -0,0 +1,16 @@
+package com.qonversion.android.sdk.dto.entitlements
+
+enum class QTransactionEnvironment(val type: String) {
+    Sandbox("sandbox"),
+    Production("production");
+
+    companion object {
+        internal fun fromType(type: String): QTransactionEnvironment {
+            return when (type) {
+                "sandbox" -> Sandbox
+                "production" -> Production
+                else -> Production
+            }
+        }
+    }
+}

sdk/src/main/java/com/qonversion/android/sdk/dto/entitlements/QTransactionOwnershipType.kt

@@ -0,0 +1,16 @@
+package com.qonversion.android.sdk.dto.entitlements
+
+enum class QTransactionOwnershipType(val type: String) {
+    Owner("owner"),
+    FamilySharing("family_sharing");
+
+    companion object {
+        internal fun fromType(type: String): QTransactionOwnershipType {
+            return when (type) {
+                "owner" -> Owner
+                "family_sharing" -> FamilySharing
+                else -> Owner
+            }
+        }
+    }
+}

sdk/src/main/java/com/qonversion/android/sdk/dto/entitlements/QTransactionType.kt

@@ -0,0 +1,25 @@
+package com.qonversion.android.sdk.dto.entitlements
+
+enum class QTransactionType(val type: String) {
+    Unknown("unknown"),
+    SubscriptionStarted("subscription_started"),
+    SubscriptionRenewed("subscription_renewed"),
+    TrialStrated("trial_started"),
+    IntroStarted("intro_started"),
+    IntroRenewed("intro_renewed"),
+    NonConsumablePurchase("non_consumable_purchase");
+
+    companion object {
+        internal fun fromType(type: String): QTransactionType {
+            return when (type) {
+                "subscription_started" -> SubscriptionStarted
+                "subscription_renewed" -> SubscriptionRenewed
+                "trial_started" -> TrialStrated
+                "intro_started" -> IntroStarted
+                "intro_renewed" -> IntroRenewed
+                "non_consumable_purchase" -> NonConsumablePurchase
+                else -> Unknown
+            }
+        }
+    }
+}