Fix session logic from a notification clicked

* This was a remaining TODO
* Moved where `appEntryState` lives away from `OneSignal` to the `OneSignalOutcomes` module, and lives on `OSSessionManager`
* Also server expects session_time as an int, not float

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignalNotifications/OSNotificationsManager.m

@@ -34,6 +34,7 @@ of this software and associated documentation files (the "Software"), to deal
 #import "OneSignalWebViewManager.h"
 #import "UNUserNotificationCenter+OneSignalNotifications.h"
 #import "UIApplicationDelegate+OneSignalNotifications.h"
+#import <OneSignalOutcomes/OSSessionManager.h>
 
 @implementation OSNotificationClickEvent
 @synthesize notification = _notification, result = _result;
@@ -696,10 +697,10 @@ + (void)handleNotificationOpened:(NSDictionary*)messageDict
 
     // Call Action Block
     [self lastMessageReceived:messageDict];
-//    if (!isActive) { TODO: Figure out session stuff from notif opened
-//        OneSignal.appEntryState = NOTIFICATION_CLICK;
-//        [[OSSessionManager sharedSessionManager] onDirectInfluenceFromNotificationOpen:_appEntryState withNotificationId:messageId];
-//    }
+    if (!isActive) {
+        OSSessionManager.sharedSessionManager.appEntryState = NOTIFICATION_CLICK;
+        [[OSSessionManager sharedSessionManager] onDirectInfluenceFromNotificationOpen:NOTIFICATION_CLICK withNotificationId:messageId];
+    }
 
     [self handleNotificationActionWithUrl:notification.launchURL actionID:actionID];
 }

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

@@ -138,7 +138,7 @@ + (instancetype _Nonnull)withActiveTime:(NSNumber * _Nonnull)activeTime
     let params = [NSMutableDictionary new];
     params[@"app_id"] = appId;
     params[@"id"] = @"os__session_duration";
-    params[@"session_time"] = activeTime;
+    params[@"session_time"] = @([activeTime intValue]);
     params[@"subscription"] = @{@"id": pushSubscriptionId, @"type": @"iOSPush"};
     params[@"onesignal_id"] = onesignalId;
 

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

@@ -41,19 +41,20 @@
 + (void)resetSharedSessionManager;
 
 @property (nonatomic) id<SessionStatusDelegate> _Nullable delegate;
+@property AppEntryAction appEntryState;
 
 - (instancetype _Nonnull)init:(Class<SessionStatusDelegate> _Nullable)delegate withTrackerFactory:(OSTrackerFactory *_Nonnull)trackerFactory;
 
 - (NSArray<OSInfluence *> *_Nonnull)getInfluences;
 - (NSArray<OSInfluence *> *_Nonnull)getSessionInfluences;
 - (void)initSessionFromCache;
-- (void)restartSessionIfNeeded:(AppEntryAction)entryAction;
+- (void)restartSessionIfNeeded;
 - (void)onInAppMessageReceived:(NSString * _Nonnull)messageId;
 - (void)onDirectInfluenceFromIAMClick:(NSString * _Nonnull)directIAMId;
 - (void)onDirectInfluenceFromIAMClickFinished;
 - (void)onNotificationReceived:(NSString * _Nonnull)notificationId;
 - (void)onDirectInfluenceFromNotificationOpen:(AppEntryAction)entryAction withNotificationId:(NSString * _Nonnull)directNotificationId;
-- (void)attemptSessionUpgrade:(AppEntryAction)entryAction;
-- (NSDate *)sessionLaunchTime;
+- (void)attemptSessionUpgrade;
+- (NSDate *_Nullable)sessionLaunchTime;
 
 @end

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

@@ -41,6 +41,7 @@ @implementation OSSessionManager
 static OSSessionManager *_sessionManager;
 
 NSDate *_sessionLaunchTime;
+AppEntryAction _appEntryState = APP_CLOSE;
 
 + (OSSessionManager*)sharedSessionManager {
     if (!_sessionManager)
@@ -52,6 +53,14 @@ + (void)resetSharedSessionManager {
     _sessionManager = nil;
 }
 
+- (AppEntryAction)appEntryState {
+    return _appEntryState;
+}
+
+- (void)setAppEntryState:(AppEntryAction)appEntryState {
+    _appEntryState = appEntryState;
+}
+
 - (instancetype _Nonnull)init:(id<SessionStatusDelegate>)delegate withTrackerFactory:(OSTrackerFactory *)trackerFactory {
     if (self = [super init]) {
         _delegate = delegate;
@@ -75,11 +84,11 @@ - (void)initSessionFromCache {
     [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"SessionManager restored from cache with influences: %@", [self getInfluences].description]];
 }
 
-- (void)restartSessionIfNeeded:(AppEntryAction)entryAction {
-    NSArray<OSChannelTracker *> *channelTrackers = [_trackerFactory channelsToResetByEntryAction:entryAction];
+- (void)restartSessionIfNeeded {
+    NSArray<OSChannelTracker *> *channelTrackers = [_trackerFactory channelsToResetByEntryAction:_appEntryState];
     NSMutableArray<OSInfluence *> *updatedInfluences = [NSMutableArray new];
 
-    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OneSignal SessionManager restartSessionIfNeeded with entryAction:: %u channelTrackers: %@", entryAction, channelTrackers.description]];
+    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OneSignal SessionManager restartSessionIfNeeded with entryAction:: %u channelTrackers: %@", _appEntryState, channelTrackers.description]];
 
     for (OSChannelTracker *channelTracker in channelTrackers) {
         NSArray *lastIds = [channelTracker lastReceivedIds];
@@ -134,12 +143,13 @@ - (void)onNotificationReceived:(NSString *)notificationId {
 }
 
 - (void)onDirectInfluenceFromNotificationOpen:(AppEntryAction)entryAction withNotificationId:(NSString *)directNotificationId {
+    _appEntryState = entryAction;
     [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OneSignal SessionManager onDirectInfluenceFromNotificationOpen notificationId: %@", directNotificationId]];
 
     if (!directNotificationId || directNotificationId.length == 0)
         return;
 
-    [self attemptSessionUpgrade:entryAction withDirectId:directNotificationId];
+    [self attemptSessionUpgradeWithDirectId:directNotificationId];
 }
 
 /*
@@ -150,15 +160,15 @@ - (void)onDirectInfluenceFromNotificationOpen:(AppEntryAction)entryAction withNo
     * INDIRECT     -> DIRECT
     * DIRECT       -> DIRECT
  */
-- (void)attemptSessionUpgrade:(AppEntryAction)entryAction {
-    [self attemptSessionUpgrade:entryAction withDirectId:nil];
+- (void)attemptSessionUpgrade {
+    [self attemptSessionUpgradeWithDirectId:nil];
 }
 
-- (void)attemptSessionUpgrade:(AppEntryAction)entryAction withDirectId:(NSString *)directId {
-    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OneSignal SessionManager attemptSessionUpgrade with entryAction: %u", entryAction]];
+- (void)attemptSessionUpgradeWithDirectId:(NSString *)directId {
+    [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OneSignal SessionManager attemptSessionUpgrade with entryAction: %u", _appEntryState]];
 
-    OSChannelTracker *channelTrackerByAction = [_trackerFactory channelByEntryAction:entryAction];
-    NSArray<OSChannelTracker *> *channelTrackersToReset = [_trackerFactory channelsToResetByEntryAction:entryAction];
+    OSChannelTracker *channelTrackerByAction = [_trackerFactory channelByEntryAction:_appEntryState];
+    NSArray<OSChannelTracker *> *channelTrackersToReset = [_trackerFactory channelsToResetByEntryAction:_appEntryState];
     NSMutableArray<OSInfluence *> *influencesToEnd = [NSMutableArray new];
     OSInfluence *lastInfluence = nil;
 
@@ -190,7 +200,7 @@ - (void)attemptSessionUpgrade:(AppEntryAction)entryAction withDirectId:(NSString
         if (channelTracker.influenceType == UNATTRIBUTED) {
             NSArray *lastIds = [channelTracker lastReceivedIds];
             // There are new ids for attribution and the application was open again without resetting session
-            if (lastIds.count > 0 && entryAction != APP_CLOSE) {
+            if (lastIds.count > 0 && _appEntryState != APP_CLOSE) {
                 // Save influence to ended it later if needed
                 // This influence will be unattributed
                 OSInfluence *influence = [channelTracker currentSessionInfluence];

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -137,15 +137,6 @@ + (OneSignalReceiveReceiptsController*)receiveReceiptsController {
     return _receiveReceiptsController;
 }
 
-static AppEntryAction _appEntryState = APP_CLOSE;
-+ (AppEntryAction)appEntryState {
-    return _appEntryState;
-}
-
-+ (void)setAppEntryState:(AppEntryAction)appEntryState {
-    _appEntryState = appEntryState;
-}
-
 + (NSString*)appId {
     return appId;
 }
@@ -391,7 +382,7 @@ + (void)startNewSessionInternal {
 
     [OSOutcomes.sharedController clearOutcomes];
 
-    [[OSSessionManager sharedSessionManager] restartSessionIfNeeded:_appEntryState];
+    [[OSSessionManager sharedSessionManager] restartSessionIfNeeded];
 
     [OneSignalTrackFirebaseAnalytics trackInfluenceOpenEvent];
 
@@ -797,6 +788,7 @@ + (void)load {
 
     [[OSMigrationController new] migrate];
 //    sessionLaunchTime = [NSDate date];
+    // TODO: sessionLaunchTime used to always be set in load
 
     [OSDialogInstanceManager setSharedInstance:[OneSignalDialogController sharedInstance]];
 }

iOS_SDK/OneSignalSDK/Source/OneSignalInternal.h

@@ -39,15 +39,9 @@
 
 @interface OneSignal (OneSignalInternal)
 
-+ (NSDate *_Nonnull)sessionLaunchTime;
-
-
 @property (class, readonly) BOOL didCallDownloadParameters;
 @property (class, readonly) BOOL downloadedParameters;
 
-@property (class) AppEntryAction appEntryState;
-@property (class) OSSessionManager* _Nonnull sessionManager;
-
 @end
 
 #endif /* OneSignalInternal_h */

iOS_SDK/OneSignalSDK/Source/OneSignalTracker.m

@@ -98,8 +98,8 @@ + (void)applicationForegrounded {
     [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"Application Foregrounded started"];
     [OSFocusTimeProcessorFactory cancelFocusCall];
 
-    if (OneSignal.appEntryState != NOTIFICATION_CLICK)
-        OneSignal.appEntryState = APP_OPEN;
+    if (OSSessionManager.sharedSessionManager.appEntryState != NOTIFICATION_CLICK)
+        OSSessionManager.sharedSessionManager.appEntryState = APP_OPEN;
 
     lastOpenedTime = [NSDate date].timeIntervalSince1970;
 
@@ -109,7 +109,7 @@ + (void)applicationForegrounded {
     else {
         // This checks if notification permissions changed when app was backgrounded
         [OSNotificationsManager sendNotificationTypesUpdateToDelegate];
-        [[OSSessionManager sharedSessionManager] attemptSessionUpgrade:OneSignal.appEntryState];
+        [[OSSessionManager sharedSessionManager] attemptSessionUpgrade];
         // TODO: Here it used to call receivedInAppMessageJson with nil, this method no longer exists
         // [OneSignal receivedInAppMessageJson:nil];
     }
@@ -125,7 +125,7 @@ + (void)applicationBackgrounded {
     if (timeElapsed < -1)
         return;
 
-    OneSignal.appEntryState = APP_CLOSE;
+    OSSessionManager.sharedSessionManager.appEntryState = APP_CLOSE;
 
     let influences = [[OSSessionManager sharedSessionManager] getSessionInfluences];
     let focusCallParams = [self createFocusCallParams:influences onSessionEnded:false];