version 3.5.0

Author: vladd-g

adapty/src/main/java/com/adapty/errors/AdaptyErrorCode.kt

@@ -26,7 +26,8 @@ public enum class AdaptyErrorCode(@get:JvmSynthetic internal val value: Int) {
     REQUEST_FAILED(2005),
     DECODING_FAILED(2006),
     ANALYTICS_DISABLED(3000),
-    WRONG_PARAMETER(3001);
+    WRONG_PARAMETER(3001),
+    PROFILE_WAS_CHANGED(3006);
 
     public companion object {
         @Deprecated(

adapty/src/main/java/com/adapty/internal/data/cache/CacheEntity.kt

@@ -8,7 +8,7 @@ internal class CacheEntity<T>(
     @SerializedName("value")
     val value: T,
     @SerializedName("version")
-    val version: Int,
+    val version: Int = 1,
     @SerializedName("cached_at")
     val cachedAt: Long = System.currentTimeMillis(),
 ) {

adapty/src/main/java/com/adapty/internal/data/cache/CacheKeys.kt

@@ -11,6 +11,7 @@ package com.adapty.internal.data.cache
 @JvmSynthetic internal const val IAM_SESSION_TOKEN = "IAM_SESSION_TOKEN"
 @JvmSynthetic internal const val PURCHASER_INFO = "PURCHASER_INFO"
 @JvmSynthetic internal const val PROFILE = "PROFILE"
+@JvmSynthetic internal const val CROSS_PLACEMENT_INFO = "CROSS_PLACEMENT_INFO"
 @JvmSynthetic internal const val CONTAINERS = "CONTAINERS"
 @JvmSynthetic internal const val FALLBACK_PAYWALLS = "FALLBACK_PAYWALLS"
 @JvmSynthetic internal const val PRODUCTS = "PRODUCTS"
@@ -23,6 +24,7 @@ package com.adapty.internal.data.cache
 @JvmSynthetic internal const val PURCHASES_HAVE_BEEN_SYNCED = "PURCHASES_HAVE_BEEN_SYNCED"
 @JvmSynthetic internal const val SESSION_ID = "SESSION_ID"
 @JvmSynthetic internal const val APP_OPENED_TIME = "APP_OPENED_TIME"
+@JvmSynthetic internal const val CROSSPLACEMENT_INFO_REQUESTED_TIME = "CROSSPLACEMENT_INFO_REQUESTED_TIME"
 @JvmSynthetic internal const val APP_KEY = "APP_KEY"
 @JvmSynthetic internal const val PAYWALL_RESPONSE_START_PART = "get_paywall_"
 @JvmSynthetic internal const val PAYWALL_RESPONSE_END_PART = "_response"

adapty/src/main/java/com/adapty/internal/data/cache/CacheRepository.kt

@@ -1,13 +1,18 @@
+@file:OptIn(InternalAdaptyApi::class)
+
 package com.adapty.internal.data.cache
 
 import androidx.annotation.RestrictTo
 import com.adapty.internal.data.models.*
 import com.adapty.internal.utils.FallbackPaywallRetriever
+import com.adapty.internal.utils.InternalAdaptyApi
+import com.adapty.internal.utils.ProfileStateChange
 import com.adapty.internal.utils.execute
 import com.adapty.internal.utils.extractLanguageCode
 import com.adapty.internal.utils.generateUuid
 import com.adapty.internal.utils.getLanguageCode
 import com.adapty.internal.utils.orDefault
+import com.adapty.internal.utils.unlockQuietly
 import com.adapty.utils.FileLocation
 import kotlinx.coroutines.flow.MutableSharedFlow
 import kotlinx.coroutines.flow.distinctUntilChanged
@@ -19,6 +24,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock
 internal class CacheRepository(
     private val preferenceManager: PreferenceManager,
     private val fallbackPaywallRetriever: FallbackPaywallRetriever,
+    private val crossPlacementInfoLock: ReentrantReadWriteLock,
 ) {
 
     private val currentProfile = MutableSharedFlow<ProfileDto>()
@@ -29,15 +35,14 @@ internal class CacheRepository(
     suspend fun updateDataOnCreateProfile(
         profile: ProfileDto,
         installationMeta: InstallationMeta,
-    ): Boolean {
-        if (profile.timestamp.orDefault() < getProfile()?.timestamp.orDefault())
-            return false
-        var profileIdHasChanged = false
-        (profile.profileId ?: (cache[UNSYNCED_PROFILE_ID] as? String))?.let { profileId ->
-            profileIdHasChanged = profileId != preferenceManager.getString(PROFILE_ID)
-
-            if (profileIdHasChanged) onNewProfileIdReceived(profileId)
-        }
+        profileStateChange: ProfileStateChange,
+    ) {
+        if (profileStateChange == ProfileStateChange.OUTDATED)
+            return
+        val profileIdHasChanged =
+            profileStateChange in listOf(ProfileStateChange.NEW, ProfileStateChange.IDENTIFIED_TO_ANOTHER)
+        if (profileIdHasChanged)
+            onNewProfileIdReceived(profile.profileId)
         if (profileIdHasChanged || (getCustomerUserId() != profile.customerUserId)) {
             clearSyncedPurchases()
         }
@@ -49,7 +54,6 @@ internal class CacheRepository(
         if (!currentUnsyncedCUIdDiffers)
             cache.remove(UNSYNCED_CUSTOMER_USER_ID)
         saveLastSentInstallationMeta(installationMeta)
-        return profileIdHasChanged
     }
 
     @JvmSynthetic
@@ -218,6 +222,26 @@ internal class CacheRepository(
         preferenceManager.saveLong(APP_OPENED_TIME, timeMillis)
     }
 
+    @JvmSynthetic
+    fun getLastRequestedCrossPlacementInfoTime() =
+        cache.safeGetOrPut(
+            CROSSPLACEMENT_INFO_REQUESTED_TIME,
+            { preferenceManager.getLong(CROSSPLACEMENT_INFO_REQUESTED_TIME, 0L) }) as? Long ?: 0L
+
+    @JvmSynthetic
+    fun saveLastRequestedCrossPlacementInfoTime(timeMillis: Long) {
+        cache[CROSSPLACEMENT_INFO_REQUESTED_TIME] = timeMillis
+        preferenceManager.saveLong(CROSSPLACEMENT_INFO_REQUESTED_TIME, timeMillis)
+    }
+
+    @JvmSynthetic
+    fun clearLastRequestedCrossPlacementInfoTime() {
+        clearData(
+            containsKeys = setOf(CROSSPLACEMENT_INFO_REQUESTED_TIME),
+            startsWithKeys = setOf(),
+        )
+    }
+
     @JvmSynthetic
     fun getProfile() =
         getData(PROFILE, ProfileDto::class.java)
@@ -284,6 +308,45 @@ internal class CacheRepository(
         cache[FALLBACK_PAYWALLS] = fallbackPaywallRetriever.getMetaInfo(source)
     }
 
+    @JvmSynthetic
+    fun getCrossPlacementInfo() =
+        try {
+            crossPlacementInfoLock.readLock().lock()
+            getCrossPlacementInfoInternal()
+        } finally {
+            crossPlacementInfoLock.readLock().unlockQuietly()
+        }
+
+    private fun getCrossPlacementInfoInternal() =
+        getData<CacheEntity<CrossPlacementInfo>>(CROSS_PLACEMENT_INFO)?.value
+
+    fun saveCrossPlacementInfo(crossPlacementInfo: CrossPlacementInfo) {
+        try {
+            crossPlacementInfoLock.writeLock().lock()
+            val oldVersion = getCrossPlacementInfoInternal()?.version ?: -1
+            if (crossPlacementInfo.version > oldVersion)
+                saveData(CROSS_PLACEMENT_INFO, CacheEntity(crossPlacementInfo))
+        } finally {
+            crossPlacementInfoLock.writeLock().unlockQuietly()
+        }
+    }
+
+    fun saveCrossPlacementInfoFromPaywall(crossPlacementInfo: CrossPlacementInfo) {
+        try {
+            crossPlacementInfoLock.writeLock().lock()
+            saveData(
+                CROSS_PLACEMENT_INFO,
+                CacheEntity(
+                    getCrossPlacementInfoInternal()
+                        ?.copy(placementWithVariationMap = crossPlacementInfo.placementWithVariationMap)
+                        ?: crossPlacementInfo
+                )
+            )
+        } finally {
+            crossPlacementInfoLock.writeLock().unlockQuietly()
+        }
+    }
+
     @JvmSynthetic
     fun clearOnLogout() {
         clearData(
@@ -294,10 +357,12 @@ internal class CacheRepository(
                 SYNCED_PURCHASES,
                 PURCHASES_HAVE_BEEN_SYNCED,
                 APP_OPENED_TIME,
+                CROSSPLACEMENT_INFO_REQUESTED_TIME,
                 PRODUCT_RESPONSE,
                 PRODUCT_RESPONSE_HASH,
                 PROFILE_RESPONSE,
                 PROFILE_RESPONSE_HASH,
+                CROSS_PLACEMENT_INFO,
             ),
             startsWithKeys = setOf(PAYWALL_RESPONSE_START_PART),
         )
@@ -324,12 +389,14 @@ internal class CacheRepository(
                 SYNCED_PURCHASES,
                 PURCHASES_HAVE_BEEN_SYNCED,
                 APP_OPENED_TIME,
+                CROSSPLACEMENT_INFO_REQUESTED_TIME,
                 PRODUCT_RESPONSE,
                 PRODUCT_RESPONSE_HASH,
                 PRODUCT_IDS_RESPONSE,
                 PRODUCT_IDS_RESPONSE_HASH,
                 PROFILE_RESPONSE,
                 PROFILE_RESPONSE_HASH,
+                CROSS_PLACEMENT_INFO,
                 ANALYTICS_DATA,
                 YET_UNPROCESSED_VALIDATE_PRODUCT_INFO,
                 EXTERNAL_ANALYTICS_ENABLED,

adapty/src/main/java/com/adapty/internal/data/cloud/CloudRepository.kt

@@ -44,11 +44,23 @@ internal class CloudRepository(
         }
     }
 
-    fun getPaywallVariations(id: String, locale: String, segmentId: String): Variations {
+    fun getPaywallVariations(id: String, locale: String, segmentId: String): Pair<Variations, Request.CurrentDataWhenSent?> {
+        val request = requestFactory.getPaywallVariationsRequest(id, locale, segmentId)
         val response = httpClient.newCall<Variations>(
-            requestFactory.getPaywallVariationsRequest(id, locale, segmentId),
+            request,
             Variations::class.java,
         )
+        when (response) {
+            is Response.Success -> return response.body to request.currentDataWhenSent
+            is Response.Error -> throw response.error
+        }
+    }
+
+    fun getPaywallByVariationId(id: String, locale: String, segmentId: String, variationId: String): PaywallDto {
+        val response = httpClient.newCall<PaywallDto>(
+            requestFactory.getPaywallByVariationIdRequest(id, locale, segmentId, variationId),
+            PaywallDto::class.java,
+        )
         when (response) {
             is Response.Success -> return response.body
             is Response.Error -> throw response.error
@@ -74,6 +86,25 @@ internal class CloudRepository(
         }
     }
 
+    @JvmSynthetic
+    fun getPaywallByVariationIdFallback(id: String, locale: String, variationId: String): PaywallDto {
+        val response = httpClient.newCall<PaywallDto>(
+            requestFactory.getPaywallByVariationIdFallbackRequest(id, locale, variationId),
+            PaywallDto::class.java,
+        )
+        when (response) {
+            is Response.Success -> return response.body
+            is Response.Error -> {
+                val error = response.error
+                when {
+                    error.adaptyErrorCode == AdaptyErrorCode.BAD_REQUEST && locale != DEFAULT_PAYWALL_LOCALE ->
+                        return getPaywallByVariationIdFallback(id, DEFAULT_PAYWALL_LOCALE, variationId)
+                    else -> throw response.error
+                }
+            }
+        }
+    }
+
     @JvmSynthetic
     fun getPaywallVariationsUntargeted(id: String, locale: String): Variations {
         val response = httpClient.newCall<Variations>(
@@ -230,6 +261,19 @@ internal class CloudRepository(
         processEmptyResponse(response)
     }
 
+    @JvmSynthetic
+    fun getCrossPlacementInfo(replacementProfileId: String?): CrossPlacementInfo {
+        val response = httpClient.newCall<CrossPlacementInfo>(
+            requestFactory.getCrossPlacementInfoRequest(replacementProfileId),
+            CrossPlacementInfo::class.java
+        )
+
+        when (response) {
+            is Response.Success -> return response.body
+            is Response.Error -> throw response.error
+        }
+    }
+
     @JvmSynthetic
     fun reportTransactionWithVariation(
         transactionId: String,

adapty/src/main/java/com/adapty/internal/data/cloud/FallbackVariationsExtractor.kt

@@ -0,0 +1,48 @@
+package com.adapty.internal.data.cloud
+
+import com.adapty.internal.utils.SinglePaywallExtractHelper
+import com.google.gson.JsonArray
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+import com.google.gson.JsonPrimitive
+
+internal class FallbackVariationsExtractor(
+    private val singlePaywallExtractHelper: SinglePaywallExtractHelper,
+): ResponseDataExtractor {
+
+    override fun extract(jsonElement: JsonElement): JsonElement? {
+        val jsonObject = jsonElement.asJsonObject
+
+        val meta = jsonObject.remove(metaKey) as? JsonObject
+        val snapshotAt = (meta?.get(responseCreatedAtKey) as? JsonPrimitive) ?: JsonPrimitive(0)
+
+        val variations = JsonArray()
+
+        jsonObject.getAsJsonObject(dataKey).entrySet()
+            .first { (key, value) ->
+                val desiredArray = (value as? JsonArray)?.isEmpty == false
+                desiredArray.also {
+                    if (desiredArray) jsonObject.addProperty(placementIdKey, key)
+                }
+            }
+            .value.asJsonArray
+            .forEach { element ->
+                ((element as? JsonObject)?.get(attributesKey) as? JsonObject)
+                    ?.let { paywall ->
+                        singlePaywallExtractHelper.addSnapshotAtIfMissing(paywall, snapshotAt)
+                        variations.add(paywall)
+                    }
+            }
+
+        jsonObject.add(dataKey, variations)
+        return jsonObject
+    }
+
+    private companion object {
+        const val dataKey = "data"
+        const val attributesKey = "attributes"
+        const val metaKey = "meta"
+        const val placementIdKey = "placement_id"
+        const val responseCreatedAtKey = "response_created_at"
+    }
+}

adapty/src/main/java/com/adapty/internal/data/cloud/ProfileExtractor.kt

@@ -0,0 +1,40 @@
+package com.adapty.internal.data.cloud
+
+import com.adapty.errors.AdaptyError
+import com.adapty.errors.AdaptyErrorCode
+import com.google.gson.JsonElement
+import com.google.gson.JsonObject
+
+internal class ProfileExtractor: ResponseDataExtractor {
+
+    override fun extract(jsonElement: JsonElement): JsonElement? {
+        val jsonObject = jsonElement.asJsonObject
+
+        if (!jsonObject.has(dataKey))
+            return extractInternal(jsonObject)
+
+        val data = jsonObject.getAsJsonObject(dataKey).getAsJsonObject(attributesKey)
+
+        return extractInternal(data)
+    }
+
+    private fun extractInternal(jsonObject: JsonObject): JsonElement? {
+        jsonObject.requires("profile_id") { "profileId in Profile should not be null" }
+        jsonObject.requires("segment_hash") { "segmentHash in Profile should not be null" }
+
+        return jsonObject
+    }
+
+    private inline fun JsonObject.requires(key: String, errorMessage: () -> String) {
+        if (!has(key))
+            throw AdaptyError(
+                message = errorMessage(),
+                adaptyErrorCode = AdaptyErrorCode.DECODING_FAILED,
+            )
+    }
+
+    private companion object {
+        const val dataKey = "data"
+        const val attributesKey = "attributes"
+    }
+}