Update trackReceivedEvent to allow Firebase influence

Cherry pick of #1241 Also adding crash protection against a nil notificaiton id and campaign
OneSignal · Aug 10, 2023 · 10f3472 · 10f3472
1 parent 9ef9c26
commit 10f3472
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalTrackFirebaseAnalytics.m b/iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalTrackFirebaseAnalytics.m
@@ -103,22 +103,11 @@ + (void)trackOpenEvent:(OSNotificationClickEvent*)event {
 }
 
 + (void)trackReceivedEvent:(OSNotification*)notification {
-    if (!trackingEnabled)
-        return;
-
     NSString *campaign = [self getCampaignNameFromNotification:notification];
     OneSignalUserDefaults *sharedUserDefaults = OneSignalUserDefaults.initShared;
     [sharedUserDefaults saveStringForKey:ONESIGNAL_FB_LAST_NOTIFICATION_ID_RECEIVED withValue:notification.notificationId];
     [sharedUserDefaults saveStringForKey:ONESIGNAL_FB_LAST_GAF_CAMPAIGN_RECEIVED withValue:campaign];
     [sharedUserDefaults saveDoubleForKey:ONESIGNAL_FB_LAST_TIME_RECEIVED withValue:[[NSDate date] timeIntervalSince1970]];
-
-    [self logEventWithName:@"os_notification_received"
-                parameters:@{
-                    @"source": @"OneSignal",
-                    @"medium": @"notification",
-                    @"notification_id": notification.notificationId,
-                    @"campaign": campaign
-                }];
 }
 
 + (void)trackInfluenceOpenEvent {
@@ -145,13 +134,19 @@ + (void)trackInfluenceOpenEvent {
     NSString *notificationId = [sharedUserDefaults getSavedStringForKey:ONESIGNAL_FB_LAST_NOTIFICATION_ID_RECEIVED defaultValue:nil];
     NSString *campaign = [sharedUserDefaults getSavedStringForKey:ONESIGNAL_FB_LAST_GAF_CAMPAIGN_RECEIVED defaultValue:nil];
 
+    NSMutableDictionary *params = [NSMutableDictionary dictionaryWithDictionary:@{
+        @"source": @"OneSignal",
+        @"medium": @"notification"
+    }];
+
+    if (notificationId) {
+        params[@"notification_id"] = notificationId;
+    }
+    if (campaign) {
+        params[@"campaign"] = campaign;
+    }
     [self logEventWithName:@"os_notification_influence_open"
-                parameters:@{
-                    @"source": @"OneSignal",
-                    @"medium": @"notification",
-                    @"notification_id": notificationId,
-                    @"campaign": campaign
-                }];
+                parameters:params];
 }
 
 @end