Merge pull request #1240 from OneSignal/fix/directSessionCount

Fix direct session count

Author: emawby

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSSessionManager.h

@@ -54,5 +54,6 @@
 - (void)onNotificationReceived:(NSString * _Nonnull)notificationId;
 - (void)onDirectInfluenceFromNotificationOpen:(AppEntryAction)entryAction withNotificationId:(NSString * _Nonnull)directNotificationId;
 - (void)attemptSessionUpgrade:(AppEntryAction)entryAction;
+- (void)resetSessionIfDirect;
 
 @end

iOS_SDK/OneSignalSDK/OneSignalOutcomes/Source/OutcomeEvents/OSSessionManager.m

@@ -72,6 +72,16 @@ - (void)initSessionFromCache {
     [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"SessionManager restored from cache with influences: %@", [self getInfluences].description]];
 }
 
+- (void)resetSessionIfDirect {
+    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"OneSignal SessionManager resetSessionIfDirect"];
+    NSArray<OSChannelTracker *> *channels = [_trackerFactory channels];
+    for (OSChannelTracker *tracker in channels) {
+        if (tracker.influenceType == DIRECT) {
+            [tracker resetAndInitInfluence];
+        }
+    }
+}
+
 - (void)restartSessionIfNeeded:(AppEntryAction)entryAction {
     NSArray<OSChannelTracker *> *channelTrackers = [_trackerFactory channelsToResetByEntryAction:entryAction];
     NSMutableArray<OSInfluence *> *updatedInfluences = [NSMutableArray new];

iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m

@@ -117,6 +117,9 @@ - (void)sendBackgroundAttributedFocusPingWithParams:(OSFocusCallParams *)params
 
         [OneSignal.stateSynchronizer sendOnFocusTime:totalTimeActive params:params withSuccess:^(NSDictionary *result) {
             [super saveUnsentActiveTime:0];
+            if (params != nil) {
+                [[OSSessionManager sharedSessionManager] resetSessionIfDirect];
+            }
             [OneSignal onesignalLog:ONE_S_LL_DEBUG message:@"sendOnFocusCallWithParams attributed succeed, saveUnsentActiveTime with 0"];
             [self endDelayBackgroundTask];
         } onFailure:^(NSDictionary<NSString *, NSError *> *errors) {