Merge pull request #1296 from OneSignal/bring_1241_to_user_model

[User Model ]Remove early return of trackReceivedEvent to allow for os_notification_influence_open event to be sent to Firebase

Author: emawby

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