Merge branch 'release/1.5.6'

Author: heart

.idea/compiler.xml

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '7.4.2' apply false
-    id 'com.android.library' version '7.4.2' apply false
+    id 'com.android.application' version '8.0.1' apply false
+    id 'com.android.library' version '8.0.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
 }
 

.idea/kotlinc.xml

@@ -20,4 +20,6 @@ kotlin.code.style=official
 # Enables namespacing of each library's R class so that its R class includes only the
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
+android.nonTransitiveRClass=true
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false

.idea/misc.xml

@@ -1,6 +1,6 @@
 #Thu Mar 17 18:19:13 ICT 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

build.gradle

@@ -35,7 +35,8 @@ class ContactConsentManager(private val consentMessageID:String, private val fra
     private fun loadConsentMessage() {
         val pamServerURL = Pam.shared.options?.pamServer
         Http.getInstance()
-            .get("${pamServerURL ?: ""}/consent-message/$consentMessageID") { result, error ->
+            .get("${pamServerURL ?: ""}/consent-message/$consentMessageID"
+            ) { result, error ->
                 if (error == null) {
                     consentMessage = Gson().fromJson(result, ContactConsentModel::class.java)
                     ready = true

gradle.properties

@@ -70,7 +70,8 @@ class TrackingConsentManager{
         consentMessageID = Pam.shared.options?.trackingConsentMessageID
         pamServerURL = Pam.shared.options?.pamServer
         Http.getInstance()
-            .get("${pamServerURL ?: ""}/consent-message/$consentMessageID") { result, error ->
+            .get("${pamServerURL ?: ""}/consent-message/$consentMessageID"
+            ) { result, error ->
                 if (error == null) {
                     trackingConsentMessageConfigurations = Gson().fromJson(result, TrackingConsentMessageConfigurations::class.java)
                     checkConsentPermission()

gradle/wrapper/gradle-wrapper.properties

@@ -58,6 +58,7 @@ class Http {
         for ((k, v) in headers) {
             requestBuilder.addHeader(k, v)
         }
+        requestBuilder.addHeader("platform", "android")
 
         val jsonString = JSONObject(data).toString()
         val requestBody = jsonString.toRequestBody()
@@ -103,6 +104,7 @@ class Http {
         for ((k, v) in headers) {
             requestBuilder.addHeader(k, v)
         }
+        requestBuilder.addHeader("platform", "android")
 
         val request = requestBuilder.build()