Address Mansis Feedback

mparticle-integrations · Mar 28, 2024 · 6b9524d · 6b9524d
1 parent 9f97e44
commit 6b9524d
Showing 1 changed file with 32 additions and 14 deletions.
diff --git a/mParticle-Google-Analytics-Firebase-GA4/MPKitFirebaseGA4Analytics.m b/mParticle-Google-Analytics-Firebase-GA4/MPKitFirebaseGA4Analytics.m
@@ -378,16 +378,24 @@ - (MPKitExecStatus *)setConsentState:(nullable MPConsentState *)state {
 }
 
 - (void)updateConsent {
-    // If Defaults are not set do not send FIRAnalytics Consent
-    if (!self.configuration[kMPFIRGA4DefaultAdStorageKey] ) {
-        return;
-    }
+    FIRConsentStatus adStorageStatus;
+    FIRConsentStatus adUserDataStatus;
+    FIRConsentStatus analyticsStorageStatus;
+    FIRConsentStatus adPersonalizationStatus;
 
     // Default Consent States
-    FIRConsentStatus adStorageStatus = [self.configuration[kMPFIRGA4DefaultAdStorageKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
-    FIRConsentStatus adUserDataStatus = [self.configuration[kMPFIRGA4DefaultAdUserDataKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
-    FIRConsentStatus analyticsStorageStatus = [self.configuration[kMPFIRGA4DefaultAnalyticsStorageKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
-    FIRConsentStatus adPersonalizationStatus = [self.configuration[kMPFIRGA4DefaultAdPersonalizationKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
+    if (self.configuration[kMPFIRGA4DefaultAdStorageKey]) {
+        adStorageStatus = [self.configuration[kMPFIRGA4DefaultAdStorageKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
+    }
+    if (self.configuration[kMPFIRGA4DefaultAdUserDataKey]) {
+        adUserDataStatus = [self.configuration[kMPFIRGA4DefaultAdUserDataKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
+    }
+    if (self.configuration[kMPFIRGA4DefaultAnalyticsStorageKey]) {
+        analyticsStorageStatus = [self.configuration[kMPFIRGA4DefaultAnalyticsStorageKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
+    }
+    if (self.configuration[kMPFIRGA4DefaultAdPersonalizationKey]) {
+        adPersonalizationStatus = [self.configuration[kMPFIRGA4DefaultAdPersonalizationKey] isEqual: @"Granted"] ? FIRConsentStatusGranted : FIRConsentStatusDenied;
+    }
 
     MParticleUser *currentUser = [[[MParticle sharedInstance] identity] currentUser];
     NSDictionary<NSString *, MPGDPRConsent *> *userConsentMap = currentUser.consentState.gdprConsentState;
@@ -410,13 +418,23 @@ - (void)updateConsent {
         adPersonalizationStatus = consent.consented ? FIRConsentStatusGranted : FIRConsentStatusDenied;
     }
 
+    // Construct a dicitonary of consents
+    NSMutableDictionary *uploadDict = [[NSMutableDictionary alloc] init];
+    if (adStorageStatus) {
+        uploadDict[FIRConsentTypeAdStorage] = adStorageStatus;
+    }
+    if (adUserDataStatus) {
+        uploadDict[FIRConsentTypeAdUserData] = adUserDataStatus;
+    }
+    if (analyticsStorageStatus) {
+        uploadDict[FIRConsentTypeAnalyticsStorage] = analyticsStorageStatus;
+    }
+    if (adPersonalizationStatus) {
+        uploadDict[FIRConsentTypeAdPersonalization] = adPersonalizationStatus;
+    }
+
     // Update Consent State with FIRAnalytics
-    [FIRAnalytics setConsent:@{
-      FIRConsentTypeAnalyticsStorage : analyticsStorageStatus,
-      FIRConsentTypeAdStorage : adStorageStatus,
-      FIRConsentTypeAdUserData : adUserDataStatus,
-      FIRConsentTypeAdPersonalization : adPersonalizationStatus,
-    }];
+    [FIRAnalytics setConsent:uploadDict];
 }
 
 - (NSString *)getEventNameForCommerceEvent:(MPCommerceEvent *)commerceEvent parameters:(NSDictionary<NSString *, id> *)parameters {