Rename notificationIds to Ids for generic influence and UserDefault new keys

Author: Jeasmine

iOS_SDK/OneSignalSDK/Source/OSChannelTracker.m

@@ -163,7 +163,7 @@ - (OSInfluence *)currentSessionInfluence {
 
 - (NSString *)description {
     return [NSString stringWithFormat:
-            @"OSChannelTracker tag: %@ influenceType: %@ indirectIds: %@ directIs: %@", [self idTag], OS_INFLUENCE_TYPE_TO_STRING(_influenceType), _indirectIds, _directId];
+            @"OSChannelTracker tag: %@ influenceType: %@ indirectIds: %@ directIds: %@", [self idTag], OS_INFLUENCE_TYPE_TO_STRING(_influenceType), _indirectIds, _directId];
 }
 
 @end

iOS_SDK/OneSignalSDK/Source/OSOutcomeEvent.m

@@ -38,7 +38,7 @@ - (id _Nonnull)initWithSession:(Session)influenceType
                         weight:(NSNumber * _Nonnull)value {
 
     if (self = [super init]) {
-        _influenceType = influenceType;
+        _session = influenceType;
         _notificationIds = notificationIds;
         _name = name;
         _timestamp = timestamp;
@@ -63,7 +63,7 @@ - (id)initFromOutcomeEventParams:(OSOutcomeEventParams *)outcomeEventParams {
             }
         }
 
-        _influenceType = influenceType;
+        _session = influenceType;
         _notificationIds = notificationId;
         _name = outcomeEventParams.outcomeId;
         _timestamp = outcomeEventParams.timestamp;
@@ -75,7 +75,7 @@ - (id)initFromOutcomeEventParams:(OSOutcomeEventParams *)outcomeEventParams {
 - (NSDictionary * _Nonnull)jsonRepresentation {
     let json = [NSMutableDictionary new];
 
-    json[@"session"] = OS_INFLUENCE_TYPE_TO_STRING(self.influenceType);
+    json[@"session"] = OS_INFLUENCE_TYPE_TO_STRING(self.session);
     json[@"id"] = self.name;
     json[@"timestamp"] = @(self.timestamp.intValue);
     json[@"weight"] = self.weight.stringValue;

iOS_SDK/OneSignalSDK/Source/OSOutcomeEventsFactory.m

@@ -57,9 +57,9 @@ - (OSOutcomeEventsRepository *)repository {
 }
 
 - (void)checkVersionChanged {
-    if (![_cache isOutcomesV2ServiceEnabled] && [_repository class] == [OSOutcomeEventsV1Repository class])
+    if (![_cache isOutcomesV2ServiceEnabled] && [_repository isKindOfClass:[OSOutcomeEventsV1Repository class]])
         return;
-    if ([_cache isOutcomesV2ServiceEnabled] && [_repository class] == [OSOutcomeEventsV2Repository class])
+    if ([_cache isOutcomesV2ServiceEnabled] && [_repository isKindOfClass:[OSOutcomeEventsV2Repository class]])
         return;
 
     [self createRepository];

iOS_SDK/OneSignalSDK/Source/OSOutcomeEventsRepository.m

@@ -144,7 +144,7 @@ - (void)saveUniqueOutcomeEventParams:(OSOutcomeEventParams *)eventParams {
     NSArray<OSCachedUniqueOutcome *> *attributedUniqueOutcomeEventSent = [self getAttributedUniqueOutcomeEventSent];
 
     NSArray *finalAttributedUniqueOutcomeEventSent = [attributedUniqueOutcomeEventSent arrayByAddingObjectsFromArray:newAttributedIds];
-    [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OSOutcomeEventsRepository finalAttributedUniqueOutcomeEventSent: %@", finalAttributedUniqueOutcomeEventSent.description]];
+    
     [self saveAttributedUniqueOutcomeEventNotificationIds:finalAttributedUniqueOutcomeEventSent];
 }
 

iOS_SDK/OneSignalSDK/Source/OSOutcomeEventsV1Repository.m

@@ -40,7 +40,7 @@ - (void)requestMeasureOutcomeEventWithAppId:(NSString *)appId
                          onFailure:(OSFailureBlock)failureBlock {
     OSOutcomeEvent *outcome = [[OSOutcomeEvent alloc] initFromOutcomeEventParams:event];
     OneSignalRequest *request;
-    switch (outcome.influenceType) {
+    switch (outcome.session) {
         case DIRECT:
             [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:@"Sending direct outcome"];
             request = [OSRequestSendOutcomesV1ToServer directWithOutcome:outcome

iOS_SDK/OneSignalSDK/Source/OSSessionManager.m

@@ -77,9 +77,9 @@ - (void)restartSessionIfNeeded:(AppEntryAction)entryAction {
         OSInfluence *influence = [channelTracker currentSessionInfluence];
         BOOL updated;
         if (lastIds.count > 0)
-            updated = [self setSessionForChannel:channelTracker withInfluenceType:INDIRECT directNotificationId:nil indirectNotificationIds:lastIds];
+            updated = [self setSessionForChannel:channelTracker withInfluenceType:INDIRECT directId:nil indirectIds:lastIds];
         else
-            updated = [self setSessionForChannel:channelTracker withInfluenceType:UNATTRIBUTED directNotificationId:nil indirectNotificationIds:nil];
+            updated = [self setSessionForChannel:channelTracker withInfluenceType:UNATTRIBUTED directId:nil indirectIds:nil];
 
         if (updated)
             [updatedInfluences addObject:influence];
@@ -100,7 +100,7 @@ - (void)onDirectInfluenceFromIAMClick:(NSString *)directIAMId {
 
     OSChannelTracker *inAppMessageTracker = [_trackerFactory iamChannelTracker];
     // We don't care about ending the session duration because IAM doesn't influence a session
-    [self setSessionForChannel:inAppMessageTracker withInfluenceType:DIRECT directNotificationId:directIAMId indirectNotificationIds:nil];
+    [self setSessionForChannel:inAppMessageTracker withInfluenceType:DIRECT directId:directIAMId indirectIds:nil];
 }
 
 - (void)onDirectInfluenceFromIAMClickFinished {
@@ -113,7 +113,7 @@ - (void)onDirectInfluenceFromIAMClickFinished {
 - (void)onNotificationReceived:(NSString *)notificationId {
     [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OneSignal SessionManager onNotificationReceived notificationId: %@", notificationId]];
 
-    if (notificationId == nil || notificationId.length == 0)
+    if (!notificationId || notificationId.length == 0)
         return;
 
     OSChannelTracker *notificationTracker = [_trackerFactory notificationChannelTracker];
@@ -123,7 +123,7 @@ - (void)onNotificationReceived:(NSString *)notificationId {
 - (void)onDirectInfluenceFromNotificationOpen:(AppEntryAction)entryAction withNotificationId:(NSString *)directNotificationId {
     [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OneSignal SessionManager onDirectInfluenceFromNotificationOpen notificationId: %@", directNotificationId]];
 
-    if (directNotificationId == nil || directNotificationId.length == 0)
+    if (!directNotificationId || directNotificationId.length == 0)
         return;
 
     [self attemptSessionUpgrade:entryAction withDirectId:directNotificationId];
@@ -153,7 +153,7 @@ - (void)attemptSessionUpgrade:(AppEntryAction)entryAction withDirectId:(NSString
     BOOL updated = NO;
     if (channelTrackerByAction) {
         lastInfluence = [channelTrackerByAction currentSessionInfluence];
-        updated = [self setSessionForChannel:channelTrackerByAction withInfluenceType:DIRECT directNotificationId:directId == nil ? channelTrackerByAction.directId : directId indirectNotificationIds:nil];
+        updated = [self setSessionForChannel:channelTrackerByAction withInfluenceType:DIRECT directId:directId ? directId : channelTrackerByAction.directId indirectIds:nil];
     }
 
     if (updated) {
@@ -181,7 +181,7 @@ - (void)attemptSessionUpgrade:(AppEntryAction)entryAction withDirectId:(NSString
                 // Save influence to ended it later if needed
                 // This influence will be unattributed
                 OSInfluence *influence = [channelTracker currentSessionInfluence];
-                updated = [self setSessionForChannel:channelTracker withInfluenceType:INDIRECT directNotificationId:nil indirectNotificationIds:lastIds];
+                updated = [self setSessionForChannel:channelTracker withInfluenceType:INDIRECT directId:nil indirectIds:lastIds];
                 // Changed from UNATTRIBUTED to INDIRECT
                 if (updated)
                     [influencesToEnd addObject:influence];
@@ -196,23 +196,23 @@ - (void)attemptSessionUpgrade:(AppEntryAction)entryAction withDirectId:(NSString
 /*
  Called when the session for the app changes, caches the state, and broadcasts the session that just ended
  */
-- (BOOL)setSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(Session)influenceType directNotificationId:(NSString *)directNotificationId indirectNotificationIds:(NSArray *)indirectNotificationIds {
-    if (![self willChangeSessionForChannel:channelTracker withInfluenceType:influenceType directNotificationId:directNotificationId indirectNotificationIds:indirectNotificationIds])
+- (BOOL)setSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(Session)influenceType directId:(NSString *)directId indirectIds:(NSArray *)indirectIds {
+    if (![self willChangeSessionForChannel:channelTracker withInfluenceType:influenceType directId:directId indirectIds:indirectIds])
         return NO;
 
-    NSString *message = @"OSChannelTracker changed: %@  \nfrom:  \ninfluenceType: %@  \n, directNotificationId: %@  \n, indirectNotificationIds: %@  \nto:  \ninfluenceType: %@  \n, directNotificationId: %@  \n, indirectNotificationIds: %@";
+    NSString *message = @"OSChannelTracker changed: %@  \nfrom:  \ninfluenceType: %@  \n, directId: %@  \n, indirectIds: %@  \nto:  \ninfluenceType: %@  \n, directId: %@  \n, indirectIds: %@";
     [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:message,
                                                        [channelTracker idTag],
                                                        OS_INFLUENCE_TYPE_TO_STRING(channelTracker.influenceType),
                                                        channelTracker.directId,
                                                        channelTracker.indirectIds,
                                                        OS_INFLUENCE_TYPE_TO_STRING(influenceType),
-                                                       directNotificationId,
-                                                       indirectNotificationIds]];
+                                                       directId,
+                                                       indirectIds]];
 
     channelTracker.influenceType = influenceType;
-    channelTracker.directId = directNotificationId;
-    channelTracker.indirectIds = indirectNotificationIds;
+    channelTracker.directId = directId;
+    channelTracker.indirectIds = indirectIds;
     [channelTracker cacheState];
 
     [OneSignal onesignal_Log:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"Trackers changed to: %@", [_trackerFactory channels].description]];
@@ -226,22 +226,22 @@ - (BOOL)setSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceTyp
     2. Is DIRECT session data different from incoming DIRECT session data?
     3. Is INDIRECT session data different from incoming INDIRECT session data?
  */
-- (BOOL)willChangeSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(Session)influenceType directNotificationId:(NSString *)directNotificationId indirectNotificationIds:(NSArray *)indirectNotificationIds {
+- (BOOL)willChangeSessionForChannel:(OSChannelTracker *)channelTracker withInfluenceType:(Session)influenceType directId:(NSString *)directId indirectIds:(NSArray *)indirectIds {
     if (channelTracker.influenceType != influenceType)
         return true;
 
     // Allow updating a direct session to a new direct when a new notification is clicked
     if (channelTracker.influenceType == DIRECT &&
         channelTracker.directId &&
-        ![channelTracker.directId isEqualToString:directNotificationId]) {
+        ![channelTracker.directId isEqualToString:directId]) {
         return true;
     }
 
     // Allow updating an indirect session to a new indirect when a new notification is received
     if (channelTracker.influenceType == INDIRECT &&
         channelTracker.indirectIds &&
         channelTracker.indirectIds.count > 0 &&
-        ![channelTracker.indirectIds isEqualToArray:indirectNotificationIds]) {
+        ![channelTracker.indirectIds isEqualToArray:indirectIds]) {
         return true;
     }
 

iOS_SDK/OneSignalSDK/Source/OneSignal.h

@@ -226,7 +226,7 @@ typedef NS_ENUM(NSUInteger, OSInfluenceChannel) {
 @interface OSOutcomeEvent : NSObject
 
 // Session enum (DIRECT, INDIRECT, UNATTRIBUTED, or DISABLED) to determine code route and request params
-@property (nonatomic) Session influenceType;
+@property (nonatomic) Session session;
 
 // Notification ids for the current session
 @property (strong, nonatomic, nullable) NSArray *notificationIds;

iOS_SDK/OneSignalSDK/Source/OneSignalCommonDefines.h

@@ -80,20 +80,20 @@
 // Receive Receipts
 #define OSUD_RECEIVE_RECEIPTS_ENABLED                                       @"OS_ENABLE_RECEIVE_RECEIPTS"                                       // * OSUD_RECEIVE_RECEIPTS_ENABLED
 // Outcomes
-#define OSUD_OUTCOMES_V2                                                    @"OUTCOMES_V2"                                                      // * OSUD_OUTCOMES_V2
+#define OSUD_OUTCOMES_V2                                                    @"OSUD_OUTCOMES_V2"
 #define OSUD_NOTIFICATION_LIMIT                                             @"NOTIFICATION_LIMIT"                                               // * OSUD_NOTIFICATION_LIMIT
-#define OSUD_IAM_LIMIT                                                      @"IAM_LIMIT"                                                        // * OSUD_IAM_LIMIT
+#define OSUD_IAM_LIMIT                                                      @"OSUD_IAM_LIMIT"
 #define OSUD_NOTIFICATION_ATTRIBUTION_WINDOW                                @"NOTIFICATION_ATTRIBUTION_WINDOW"                                  // * OSUD_NOTIFICATION_ATTRIBUTION_WINDOW
-#define OSUD_IAM_ATTRIBUTION_WINDOW                                         @"IAM_ATTRIBUTION_WINDOW"                                           // * OSUD_IAM_ATTRIBUTION_WINDOW
+#define OSUD_IAM_ATTRIBUTION_WINDOW                                         @"OSUD_IAM_ATTRIBUTION_WINDOW"
 #define OSUD_DIRECT_SESSION_ENABLED                                         @"DIRECT_SESSION_ENABLED"                                           // * OSUD_DIRECT_SESSION_ENABLED
 #define OSUD_INDIRECT_SESSION_ENABLED                                       @"INDIRECT_SESSION_ENABLED"                                         // * OSUD_INDIRECT_SESSION_ENABLED
 #define OSUD_UNATTRIBUTED_SESSION_ENABLED                                   @"UNATTRIBUTED_SESSION_ENABLED"                                     // * OSUD_UNATTRIBUTED_SESSION_ENABLED
 #define OSUD_CACHED_NOTIFICATION_INFLUENCE                                  @"CACHED_SESSION"                                                   // * OSUD_CACHED_NOTIFICATION_INFLUENCE
-#define OSUD_CACHED_IAM_INFLUENCE                                           @"CACHED_IAM_INFLUENCE"                                             // * OSUD_CACHED_IAM_INFLUENCE
+#define OSUD_CACHED_IAM_INFLUENCE                                           @"OSUD_CACHED_IAM_INFLUENCE"
 #define OSUD_CACHED_DIRECT_NOTIFICATION_ID                                  @"CACHED_DIRECT_NOTIFICATION_ID"                                    // * OSUD_CACHED_DIRECT_NOTIFICATION_ID
 #define OSUD_CACHED_INDIRECT_NOTIFICATION_IDS                               @"CACHED_INDIRECT_NOTIFICATION_IDS"                                 // * OSUD_CACHED_INDIRECT_NOTIFICATION_IDS
 #define OSUD_CACHED_RECEIVED_NOTIFICATION_IDS                               @"CACHED_RECEIVED_NOTIFICATION_IDS"                                 // * OSUD_CACHED_RECEIVED_NOTIFICATION_IDS
-#define OSUD_CACHED_RECEIVED_IAM_IDS                                        @"CACHED_RECEIVED_IAM_IDS"                                          // * OSUD_CACHED_RECEIVED_IAM_IDS
+#define OSUD_CACHED_RECEIVED_IAM_IDS                                        @"OSUD_CACHED_RECEIVED_IAM_IDS"
 #define OSUD_CACHED_UNATTRIBUTED_UNIQUE_OUTCOME_EVENTS_SENT                 @"CACHED_UNATTRIBUTED_UNIQUE_OUTCOME_EVENTS_SENT"                   // * OSUD_CACHED_UNATTRIBUTED_UNIQUE_OUTCOME_EVENTS_SENT
 #define OSUD_CACHED_ATTRIBUTED_UNIQUE_OUTCOME_EVENT_NOTIFICATION_IDS_SENT   @"CACHED_ATTRIBUTED_UNIQUE_OUTCOME_EVENT_NOTIFICATION_IDS_SENT"     // * OSUD_CACHED_ATTRIBUTED_UNIQUE_OUTCOME_EVENT_NOTIFICATION_IDS_SENT
 // Time Tracking