Merge branch 'master' into develop

SourcePointUSA · Oct 25, 2023 · 86ab8c2 · 86ab8c2
2 parents a82db09 + fb2b783
commit 86ab8c2
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 7.4.2 (October, 25, 2023)
+* [DIA-2918](https://sourcepoint.atlassian.net/browse/DIA-2918) Fix ConsentStatus missing (#726)
+
 ## 7.4.1 (October, 24, 2023)
 * [DIA-2542](https://sourcepoint.atlassian.net/browse/DIA-2542) Local data versioning (#712)
 * [DIA-2757](https://sourcepoint.atlassian.net/browse/DIA-2757) UI test for the applies condition (#714)

diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ To use `cmplibrary` in your app, include `com.sourcepoint.cmplibrary:cmplibrary:
 ```
 ...
 dependencies {
-    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.1'
+    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.2'
 }
 ```
 

diff --git a/cmplibrary/gradle.properties b/cmplibrary/gradle.properties
@@ -1,4 +1,4 @@
-VERSION_NAME = 7.4.1
+VERSION_NAME = 7.4.2
 
 POM_NAME = cmplibrary
 POM_REPO = sourcepoint

diff --git a/cmplibrary/release_note.txt b/cmplibrary/release_note.txt
@@ -1,4 +1 @@
-* [DIA-2542](https://sourcepoint.atlassian.net/browse/DIA-2542) Local data versioning (#712)
-* [DIA-2757](https://sourcepoint.atlassian.net/browse/DIA-2757) UI test for the applies condition (#714)
-* [DIA-2901](https://sourcepoint.atlassian.net/browse/DIA-2901) onConsentReady Fires GDPR Applies False After Saving Partial Consent (#714)
-* [DIA-2851](https://sourcepoint.atlassian.net/browse/DIA-2851) Automation test for  the no internet exception (#713)
+* [DIA-2918](https://sourcepoint.atlassian.net/browse/DIA-2918) Fix ConsentStatus missing (#726)
diff --git a/cmplibrary/src/main/java/com/sourcepoint/cmplibrary/campaign/CampaignManager.kt b/cmplibrary/src/main/java/com/sourcepoint/cmplibrary/campaign/CampaignManager.kt
@@ -413,10 +413,22 @@ private class CampaignManagerImpl(
             val hasNonEligibleLocalDataVersion =
                 dataStorage.localDataVersion != DataStorage.LOCAL_DATA_VERSION_HARDCODED_VALUE
 
-            return (isGdprOrCcpaUuidPresent && isLocalStateEmpty) ||
+            val res = (isGdprOrCcpaUuidPresent && isLocalStateEmpty) ||
                 isV6LocalStatePresent ||
                 isV6LocalStatePresent2 ||
                 hasNonEligibleLocalDataVersion
+
+            logger?.computation(
+                tag = "shouldCallConsentStatus",
+                msg = """
+                isGdprOrCcpaUuidPresent[$isGdprOrCcpaUuidPresent] - isLocalStateEmpty[$isLocalStateEmpty]
+                isV6LocalStatePresent[$isV6LocalStatePresent] - isV6LocalStatePresent2[$isV6LocalStatePresent2]
+                hasNonEligibleLocalDataVersion[$hasNonEligibleLocalDataVersion]
+                res[$res]
+                """.trimIndent()
+            )
+
+            return res
         }
 
     override var gdprMessageMetaData: MessageMetaData?

diff --git a/samples/metaapp/gradle.properties b/samples/metaapp/gradle.properties
@@ -1,2 +1,2 @@
 #Mon Sep 04 08:31:34 UTC 2023
-VERSION_CODE=99
+VERSION_CODE=100
diff --git a/samples/native-message-demo/build.gradle b/samples/native-message-demo/build.gradle
@@ -70,5 +70,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
-    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.1'
+    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.2'
 }
diff --git a/samples/web-message-demo/build.gradle b/samples/web-message-demo/build.gradle
@@ -70,5 +70,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
-    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.1'
+    implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.2'
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     ```
     ...
     dependencies {
-        implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.1'
+        implementation 'com.sourcepoint.cmplibrary:cmplibrary:7.4.2'
     }
     ```
@@ Expand Down @@