DIA-3350 Make SPGCMData optional

Author: Nevazhnovu

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;
         }

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;
     }
 }

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();
         }