From 82128e8381d18abe8beb95cb9aa105b7bd41ffe4 Mon Sep 17 00:00:00 2001 From: Egor Kitselyuk Date: Thu, 6 Feb 2025 19:10:43 +0300 Subject: [PATCH 1/3] Bump SDK version to 2.12.0 --- example/app/build.gradle | 2 +- gradle.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example/app/build.gradle b/example/app/build.gradle index b27ea95aa..a864f4b43 100644 --- a/example/app/build.gradle +++ b/example/app/build.gradle @@ -75,7 +75,7 @@ dependencies { implementation 'com.google.code.gson:gson:2.11.0' //Mindbox - implementation 'cloud.mindbox:mobile-sdk:2.12.0-rc' + implementation 'cloud.mindbox:mobile-sdk:2.12.0' implementation 'cloud.mindbox:mindbox-firebase' implementation 'cloud.mindbox:mindbox-huawei' implementation 'cloud.mindbox:mindbox-rustore' diff --git a/gradle.properties b/gradle.properties index e5c39b315..cc9de21cb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,5 +20,5 @@ android.enableJetifier=true # Kotlin code style for this project: "official" or "obsolete": kotlin.code.style=official # SDK version property -SDK_VERSION_NAME=2.12.0-rc +SDK_VERSION_NAME=2.12.0 android.nonTransitiveRClass = false \ No newline at end of file From b2de1514aea827a601df17b19677fe68b7c74deb Mon Sep 17 00:00:00 2001 From: Egor Kitselyuk Date: Wed, 12 Feb 2025 11:37:35 +0300 Subject: [PATCH 2/3] WMRUSTORE-36: Fix save config order --- sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt b/sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt index 0700c56be..14490b1fd 100644 --- a/sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt +++ b/sdk/src/main/java/cloud/mindbox/mobile_sdk/Mindbox.kt @@ -570,9 +570,9 @@ object Mindbox : MindboxLog { initScope.launch { InitializeLock.await(InitializeLock.State.MIGRATION) - DbManager.saveConfigurations(Configuration(configuration)) val checkResult = checkConfig(configuration) val validatedConfiguration = validateConfiguration(configuration) + DbManager.saveConfigurations(Configuration(configuration)) logI("init. checkResult: $checkResult") if (checkResult != ConfigUpdate.NOT_UPDATED && !MindboxPreferences.isFirstInitialize) { logI("init. softReinitialization") From fbd65cce8a6625303b179311d44377c5b1d92f26 Mon Sep 17 00:00:00 2001 From: Egor Kitselyuk Date: Wed, 12 Feb 2025 13:13:46 +0300 Subject: [PATCH 3/3] Disable rustore provider for api below 22 --- mindbox-rustore/src/main/AndroidManifest.xml | 11 ++++++++++- mindbox-rustore/src/main/res/values-v23/bools.xml | 4 ++++ mindbox-rustore/src/main/res/values/bools.xml | 4 ++++ 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 mindbox-rustore/src/main/res/values-v23/bools.xml create mode 100644 mindbox-rustore/src/main/res/values/bools.xml diff --git a/mindbox-rustore/src/main/AndroidManifest.xml b/mindbox-rustore/src/main/AndroidManifest.xml index deb4d28b0..13be915a8 100644 --- a/mindbox-rustore/src/main/AndroidManifest.xml +++ b/mindbox-rustore/src/main/AndroidManifest.xml @@ -1,4 +1,13 @@ - + + + + \ No newline at end of file diff --git a/mindbox-rustore/src/main/res/values-v23/bools.xml b/mindbox-rustore/src/main/res/values-v23/bools.xml new file mode 100644 index 000000000..9236476fe --- /dev/null +++ b/mindbox-rustore/src/main/res/values-v23/bools.xml @@ -0,0 +1,4 @@ + + + true + \ No newline at end of file diff --git a/mindbox-rustore/src/main/res/values/bools.xml b/mindbox-rustore/src/main/res/values/bools.xml new file mode 100644 index 000000000..fa2de595d --- /dev/null +++ b/mindbox-rustore/src/main/res/values/bools.xml @@ -0,0 +1,4 @@ + + + false + \ No newline at end of file