Merge branch 'develop' into DIA-4458-integrate-unified-core

# Conflicts: # cmplibrary/src/androidTest/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerImplTest.kt
SourcePointUSA · Dec 17, 2024 · 7172071 · 7172071
2 parents d6d4778 + e0460c6
commit 7172071
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/...brary/src/androidTest/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerImplTest.kt b/...brary/src/androidTest/java/com/sourcepoint/cmplibrary/campaign/CampaignManagerImplTest.kt
@@ -167,7 +167,7 @@ class CampaignManagerImplTest {
 
         dataStorage.gdprExpirationDate = "2022-10-27T17:15:57.006Z"
         dataStorage.ccpaExpirationDate = "2025-10-27T17:15:57.006Z"
-        campaignManager.usNatCS = usnatMock.copy(expirationDate = "2025-10-27T17:15:57.006Z")
+        campaignManager.usNatConsentData = usnatMock.copy(expirationDate = "2025-10-27T17:15:57.006Z")
 
         campaignManager.isGdprExpired.assertTrue()
         campaignManager.isCcpaExpired.assertFalse()
@@ -179,7 +179,7 @@ class CampaignManagerImplTest {
 
         dataStorage.gdprExpirationDate = "2025-10-27T17:15:57.006Z"
         dataStorage.ccpaExpirationDate = "2022-10-27T17:15:57.006Z"
-        campaignManager.usNatCS = usnatMock.copy(expirationDate = "2025-10-27T17:15:57.006Z")
+        campaignManager.usNatConsentData = usnatMock.copy(expirationDate = "2025-10-27T17:15:57.006Z")
 
         campaignManager.isGdprExpired.assertFalse()
         campaignManager.isCcpaExpired.assertTrue()
@@ -191,7 +191,7 @@ class CampaignManagerImplTest {
 
         dataStorage.gdprExpirationDate = "2025-10-27T17:15:57.006Z"
         dataStorage.ccpaExpirationDate = "2025-10-27T17:15:57.006Z"
-        campaignManager.usNatCS = usnatMock.copy(expirationDate = "2022-10-27T17:15:57.006Z")
+        campaignManager.usNatConsentData = usnatMock.copy(expirationDate = "2022-10-27T17:15:57.006Z")
 
         campaignManager.isGdprExpired.assertFalse()
         campaignManager.isCcpaExpired.assertFalse()

diff --git a/...etaapp/src/main/java/com/sourcepointmeta/metaapp/ui/property/AddUpdatePropertyFragment.kt b/...etaapp/src/main/java/com/sourcepointmeta/metaapp/ui/property/AddUpdatePropertyFragment.kt
@@ -85,7 +85,7 @@ class AddUpdatePropertyFragment : Fragment() {
             val dialogBinding = AddTargetingParameterBinding.inflate(layoutInflater)
             MaterialAlertDialogBuilder(requireContext())
                 .setTitle("Add new targeting parameter")
-                .setView(R.layout.add_targeting_parameter)
+                .setView(dialogBinding.root)
                 .setPositiveButton("Create") { _, _ ->
                     val key = dialogBinding.tpKeyEd.text
                     val value = dialogBinding.tpValueEt.text
@@ -99,7 +99,7 @@ class AddUpdatePropertyFragment : Fragment() {
             val dialogBinding = AddTargetingParameterBinding.inflate(layoutInflater)
             MaterialAlertDialogBuilder(requireContext())
                 .setTitle("Add new targeting parameter")
-                .setView(R.layout.add_targeting_parameter)
+                .setView(dialogBinding.root)
                 .setPositiveButton("Create") { _, _ ->
                     val key = dialogBinding.tpKeyEd.text
                     val value = dialogBinding.tpValueEt.text
@@ -113,7 +113,7 @@ class AddUpdatePropertyFragment : Fragment() {
             val dialogBinding = AddTargetingParameterBinding.inflate(layoutInflater)
             MaterialAlertDialogBuilder(requireContext())
                 .setTitle("Add new targeting parameter")
-                .setView(R.layout.add_targeting_parameter)
+                .setView(dialogBinding.root)
                 .setPositiveButton("Create") { _, _ ->
                     val key = dialogBinding.tpKeyEd.text
                     val value = dialogBinding.tpValueEt.text