Merge pull request #44 from SourcePointUSA/DIA-3350-update-ios-sdk-to-7.6.3

Nevazhnovu · web-flow · commit b5bf286f8741 · 2024-02-27T20:09:35.000+01:00
DIA-3350 update ios sdk to 7.6.3
diff --git a/Assets/ConsentManagementProvider/Plugins/iOS/Source/SwiftBridge.swift b/Assets/ConsentManagementProvider/Plugins/iOS/Source/SwiftBridge.swift
@@ -290,7 +290,7 @@ extension SwiftBridge {
     }
     
     @objc public func setCallbackOnCustomConsent(callback: @escaping СallbackCharMessage) -> Void{
-        print("setCallbackOnSPFinished")
+        print("setCallbackOnCustomConsent")
         callbackOnCustomConsent = callback
     }
 
diff --git a/Assets/ConsentManagementProvider/Scripts/json/JsonUnwrapper.cs b/Assets/ConsentManagementProvider/Scripts/json/JsonUnwrapper.cs
@@ -102,12 +102,15 @@ public static SpGdprConsent UnwrapSpGdprConsentAndroid(SpGdprConsentWrapperAndro
                 }
             }
 
-            unwrapped.googleConsentMode = new SPGCMData(
-                wrappedGdpr.gcmStatus.ad_storage,
-                wrappedGdpr.gcmStatus.analytics_storage,
-                wrappedGdpr.gcmStatus.ad_user_data,
-                wrappedGdpr.gcmStatus.ad_personalization
-            );
+            if (wrappedGdpr.gcmStatus != null)
+            {
+                unwrapped.googleConsentMode = new SPGCMData(
+                    wrappedGdpr.gcmStatus.ad_storage,
+                    wrappedGdpr.gcmStatus.analytics_storage,
+                    wrappedGdpr.gcmStatus.ad_user_data,
+                    wrappedGdpr.gcmStatus.ad_personalization
+                );
+            }
 
             return new SpGdprConsent(unwrapped);
         }
@@ -242,12 +245,15 @@ private static GdprConsent UnwrapGdprConsent(GdprConsentWrapper wrapped)
                 unwrapped.consentStatus = UnwrapConsentStatus(wrapped.consentStatus);
             }
             
-            unwrapped.googleConsentMode = new SPGCMData(
-                wrapped.gcmStatus.ad_storage,
-                wrapped.gcmStatus.analytics_storage,
-                wrapped.gcmStatus.ad_user_data,
-                wrapped.gcmStatus.ad_personalization
-            );
+            if (wrapped.gcmStatus != null)
+            {
+                unwrapped.googleConsentMode = new SPGCMData(
+                    wrapped.gcmStatus.ad_storage,
+                    wrapped.gcmStatus.analytics_storage,
+                    wrapped.gcmStatus.ad_user_data,
+                    wrapped.gcmStatus.ad_personalization
+                );
+            }
             
             return unwrapped;
         }
diff --git a/Assets/ConsentManagementProvider/Scripts/json/wrappers/GdprConsentWrapper.cs b/Assets/ConsentManagementProvider/Scripts/json/wrappers/GdprConsentWrapper.cs
@@ -12,6 +12,6 @@ internal class GdprConsentWrapper
         public bool applies;
         public string webConsentPayload;
         public ConsentStatusWrapper consentStatus;
-        public GCMDataWrapper gcmStatus;
+        public GCMDataWrapper? gcmStatus;
     }
 }
diff --git a/Assets/ConsentManagementProvider/Scripts/model/common/GdprConsent.cs b/Assets/ConsentManagementProvider/Scripts/model/common/GdprConsent.cs
@@ -13,7 +13,7 @@ public class GdprConsent
         public Dictionary<string, SpVendorGrant> grants;
 		public List<string> acceptedCategories;
         public ConsentStatus consentStatus;
-        public SPGCMData googleConsentMode;
+        public SPGCMData? googleConsentMode;
 
         public string ToFullString()
         {
@@ -55,7 +55,8 @@ public string ToFullString()
                     sb.AppendLine($"    {category}");
             }
 
-            sb.AppendLine($"adStorage: {googleConsentMode.adStorage}, analyticsStorage: {googleConsentMode.analyticsStorage}, adUserData: {googleConsentMode.adUserData}, adPersonalization: {googleConsentMode.adPersonalization}");
+            if(googleConsentMode != null)
+                sb.AppendLine($"adStorage: {googleConsentMode.adStorage}, analyticsStorage: {googleConsentMode.analyticsStorage}, adUserData: {googleConsentMode.adUserData}, adPersonalization: {googleConsentMode.adPersonalization}");
 
             return sb.ToString();
         }
diff --git a/Assets/ExampleApp/Scenes/SourcepointSampleScene.unity b/Assets/ExampleApp/Scenes/SourcepointSampleScene.unity
@@ -431,7 +431,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -945.9999}
+  m_AnchoredPosition: {x: 0, y: -1145.9999}
   m_SizeDelta: {x: 720, y: 180}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &448136250
@@ -577,7 +577,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 676, y: 79.456}
+  m_AnchoredPosition: {x: 0, y: -945}
   m_SizeDelta: {x: 720, y: 180}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &506840119
@@ -1613,7 +1613,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: Clear Data
+  m_Text: Delete custom consent
 --- !u!222 &1196510775
 CanvasRenderer:
   m_ObjectHideFlags: 0
diff --git a/Assets/ExampleApp/Scripts/PrivacySettings.cs b/Assets/ExampleApp/Scripts/PrivacySettings.cs
@@ -129,7 +129,6 @@ public void OnClearCustomConsentDataPress()
             legIntCategories: this.legIntCategories,
             onSuccessDelegate: SuccessDelegate
         );
-        storedConsentString = null;
         updateUI();
     }
 
@@ -142,7 +141,8 @@ public void OnLoadMessagePress()
 
     public void OnConsentReady(SpConsents consents)
     {
-        storedConsentString = consents.gdpr.consents.euconsent;
+        storedConsentString = consents.gdpr.consents.euconsent ?? "--";
+        CmpDebugUtil.Log(consents.gdpr.consents.ToFullString());
         updateUI();
     }
 
@@ -151,8 +151,8 @@ private void updateUI()
         if (storedConsentString != null)
         {
             loadMessageButton.interactable = false;
-            gdprPrivacySettingsButton.interactable = true;
-            ccpaPrivacySettingsButton.interactable = true;
+            gdprPrivacySettingsButton.interactable = useGDPR;
+            ccpaPrivacySettingsButton.interactable = useCCPA;
             customConsentButton.interactable = true;
             clearDataButton.interactable = true;
             consentValueText.text = storedConsentString;
diff --git a/Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml b/Assets/ExternalDependencyManager/Editor/SourcepointDependencies.xml
@@ -31,7 +31,7 @@
          * "subspecs" (optional)
            Subspecs to include for the pod.
      -->
-    <iosPod name="ConsentViewController" version="7.6.0" bitcodeEnabled="true"
+    <iosPod name="ConsentViewController" version="7.6.3" bitcodeEnabled="true"
             minTargetSdk="10.0" addToAllTargets="true">
 
     </iosPod>

Original file line number	Diff line number	Diff line change
`@@ -290,7 +290,7 @@ extension SwiftBridge {`
`290`	`290`	`}`
`291`	`291`
`292`	`292`	`@objc public func setCallbackOnCustomConsent(callback: @escaping СallbackCharMessage) -> Void{`
`293`		`- print("setCallbackOnSPFinished")`
	`293`	`+ print("setCallbackOnCustomConsent")`
`294`	`294`	`callbackOnCustomConsent = callback`
`295`	`295`	`}`
`296`	`296`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ internal class GdprConsentWrapper`
`12`	`12`	`public bool applies;`
`13`	`13`	`public string webConsentPayload;`
`14`	`14`	`public ConsentStatusWrapper consentStatus;`
`15`		`- public GCMDataWrapper gcmStatus;`
	`15`	`+ public GCMDataWrapper? gcmStatus;`
`16`	`16`	`}`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public class GdprConsent`
`13`	`13`	`public Dictionary<string, SpVendorGrant> grants;`
`14`	`14`	`public List<string> acceptedCategories;`
`15`	`15`	`public ConsentStatus consentStatus;`
`16`		`- public SPGCMData googleConsentMode;`
	`16`	`+ public SPGCMData? googleConsentMode;`
`17`	`17`
`18`	`18`	`public string ToFullString()`
`19`	`19`	`{`
`@@ -55,7 +55,8 @@ public string ToFullString()`
`55`	`55`	`sb.AppendLine($" {category}");`
`56`	`56`	`}`
`57`	`57`
`58`		`- sb.AppendLine($"adStorage: {googleConsentMode.adStorage}, analyticsStorage: {googleConsentMode.analyticsStorage}, adUserData: {googleConsentMode.adUserData}, adPersonalization: {googleConsentMode.adPersonalization}");`
	`58`	`+ if(googleConsentMode != null)`
	`59`	`+ sb.AppendLine($"adStorage: {googleConsentMode.adStorage}, analyticsStorage: {googleConsentMode.analyticsStorage}, adUserData: {googleConsentMode.adUserData}, adPersonalization: {googleConsentMode.adPersonalization}");`
`59`	`60`
`60`	`61`	`return sb.ToString();`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,6 @@ public void OnClearCustomConsentDataPress()`
`129`	`129`	`legIntCategories: this.legIntCategories,`
`130`	`130`	`onSuccessDelegate: SuccessDelegate`
`131`	`131`	`);`
`132`		`- storedConsentString = null;`
`133`	`132`	`updateUI();`
`134`	`133`	`}`
`135`	`134`
`@@ -142,7 +141,8 @@ public void OnLoadMessagePress()`
`142`	`141`
`143`	`142`	`public void OnConsentReady(SpConsents consents)`
`144`	`143`	`{`
`145`		`- storedConsentString = consents.gdpr.consents.euconsent;`
	`144`	`+ storedConsentString = consents.gdpr.consents.euconsent ?? "--";`
	`145`	`+ CmpDebugUtil.Log(consents.gdpr.consents.ToFullString());`
`146`	`146`	`updateUI();`
`147`	`147`	`}`
`148`	`148`
`@@ -151,8 +151,8 @@ private void updateUI()`
`151`	`151`	`if (storedConsentString != null)`
`152`	`152`	`{`
`153`	`153`	`loadMessageButton.interactable = false;`
`154`		`- gdprPrivacySettingsButton.interactable = true;`
`155`		`- ccpaPrivacySettingsButton.interactable = true;`
	`154`	`+ gdprPrivacySettingsButton.interactable = useGDPR;`
	`155`	`+ ccpaPrivacySettingsButton.interactable = useCCPA;`
`156`	`156`	`customConsentButton.interactable = true;`
`157`	`157`	`clearDataButton.interactable = true;`
`158`	`158`	`consentValueText.text = storedConsentString;`