From 829bbfa2406e42fbe6b3b08a642f0e6c66e57067 Mon Sep 17 00:00:00 2001 From: emtsov Date: Fri, 16 Feb 2024 11:24:06 +0300 Subject: [PATCH 1/3] Bump SDK version to 2.8.4 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3789c1f62..b9fa9c40b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official # SDK version property -SDK_VERSION_NAME=2.8.3 \ No newline at end of file +SDK_VERSION_NAME=2.8.4 \ No newline at end of file From 152746a403d5ba0a2ff5b67b6a4093cc62b2ef56 Mon Sep 17 00:00:00 2001 From: Sergey Sozinov Date: Thu, 7 Mar 2024 18:19:24 +0300 Subject: [PATCH 2/3] Bump SDK version to 2.8.5 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 3789c1f62..d3c4a2fc7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -21,4 +21,4 @@ android.enableJetifier=true kotlin.code.style=official # SDK version property -SDK_VERSION_NAME=2.8.3 \ No newline at end of file +SDK_VERSION_NAME=2.8.5 \ No newline at end of file From 0f422b2df75aa21a5c22e9e6d390853cd0ac4f92 Mon Sep 17 00:00:00 2001 From: Robert Alimbekov Date: Wed, 13 Mar 2024 21:05:50 +0500 Subject: [PATCH 3/3] fixing system name lowercase --- .../mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt | 8 +++----- .../mobile_sdk/inapp/domain/InAppInteractorImpl.kt | 2 -- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt index 94d1c1121..3591a7b92 100644 --- a/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt +++ b/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/data/mapper/InAppMapper.kt @@ -7,8 +7,6 @@ import cloud.mindbox.mobile_sdk.inapp.data.dto.ElementDto import cloud.mindbox.mobile_sdk.inapp.data.dto.GeoTargetingDto import cloud.mindbox.mobile_sdk.inapp.data.dto.PayloadDto import cloud.mindbox.mobile_sdk.inapp.domain.models.* -import cloud.mindbox.mobile_sdk.inapp.domain.models.InAppType.ModalWindow.* -import cloud.mindbox.mobile_sdk.inapp.data.dto.PayloadDto.ModalWindowDto.* import cloud.mindbox.mobile_sdk.inapp.domain.models.ProductResponse import cloud.mindbox.mobile_sdk.models.TreeTargetingDto import cloud.mindbox.mobile_sdk.models.operation.Ids @@ -202,10 +200,10 @@ internal class InAppMapper { left = payloadDto.content.position.margin.left!!.roundToInt(), right = payloadDto.content.position.margin.right!!.roundToInt(), bottom = payloadDto.content.position.margin.bottom!!.roundToInt() - ), + ), - ) + ) ) } @@ -235,7 +233,7 @@ internal class InAppMapper { ) } ?: emptyList(), operations = inAppConfigResponse.settings?.map { (key, value) -> - key.enumValue() to OperationSystemName(value.systemName) + key.enumValue() to OperationSystemName(value.systemName.lowercase()) }?.toMap() ?: emptyMap(), abtests = inAppConfigResponse.abtests?.map { dto -> ABTest( diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/domain/InAppInteractorImpl.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/domain/InAppInteractorImpl.kt index bca88d414..71ae77b48 100644 --- a/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/domain/InAppInteractorImpl.kt +++ b/sdk/src/main/java/cloud/mindbox/mobile_sdk/inapp/domain/InAppInteractorImpl.kt @@ -112,8 +112,6 @@ internal class InAppInteractorImpl( } } } - - } override fun isInAppShown(): Boolean {