Merge pull request #1288 from OneSignal/5.0.0/fix_session_influence

[5.0.0] Fix direct session influence

Author: nan-li

iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj

@@ -70,10 +70,10 @@
 		3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */; };
 		3C44673E296D099D0039A49E /* OneSignalMobileProvision.m in Sources */ = {isa = PBXBuildFile; fileRef = 912411FD1E73342200E41FD7 /* OneSignalMobileProvision.m */; };
 		3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */ = {isa = PBXBuildFile; fileRef = 912411FC1E73342200E41FD7 /* OneSignalMobileProvision.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		3C448B9D2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h */; };
-		3C448B9E2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
-		3C448B9F2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
-		3C448BA02936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */; };
+		3C448B9D2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */; };
+		3C448B9E2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
+		3C448B9F2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
+		3C448BA02936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
 		3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */; };
 		3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C47A972292642B100312125 /* OneSignalConfigManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C47A973292642B100312125 /* OneSignalConfigManager.m */; };
@@ -732,8 +732,8 @@
 		3C2C7DC5288E00AA0020F9AE /* UserModelObjcTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = UserModelObjcTests.m; sourceTree = "<group>"; };
 		3C2C7DC7288F3C020020F9AE /* OSSubscriptionModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSSubscriptionModel.swift; sourceTree = "<group>"; };
 		3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSDelta.swift; sourceTree = "<group>"; };
-		3C448B9B2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskManagerImpl.h; sourceTree = "<group>"; };
-		3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskManagerImpl.m; sourceTree = "<group>"; };
+		3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskHandlerImpl.h; sourceTree = "<group>"; };
+		3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskHandlerImpl.m; sourceTree = "<group>"; };
 		3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSBackgroundTaskManager.swift; sourceTree = "<group>"; };
 		3C47A972292642B100312125 /* OneSignalConfigManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalConfigManager.h; sourceTree = "<group>"; };
 		3C47A973292642B100312125 /* OneSignalConfigManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalConfigManager.m; sourceTree = "<group>"; };
@@ -1539,8 +1539,8 @@
 				912412051E73342200E41FD7 /* OneSignalTrackIAP.m */,
 				7A93269225AF4E6700BBEC27 /* OSPendingCallbacks.h */,
 				7A93269B25AF4F0200BBEC27 /* OSPendingCallbacks.m */,
-				3C448B9B2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h */,
-				3C448B9C2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m */,
+				3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */,
+				3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */,
 				DEC08AFF2947D4E900C81DA3 /* OneSignalSwiftInterface.swift */,
 			);
 			path = Source;
@@ -2105,7 +2105,7 @@
 				7AECE59C23675F5700537907 /* OSFocusTimeProcessorFactory.h in Headers */,
 				7AECE59A23674ADC00537907 /* OSUnattributedFocusTimeProcessor.h in Headers */,
 				9124121D1E73342200E41FD7 /* OneSignalJailbreakDetection.h in Headers */,
-				3C448B9D2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.h in Headers */,
+				3C448B9D2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h in Headers */,
 				912412151E73342200E41FD7 /* OneSignalHelper.h in Headers */,
 				91C7725E1E7CCE1000D612D0 /* OneSignalInternal.h in Headers */,
 			);
@@ -2768,7 +2768,7 @@
 				7A93269C25AF4F0200BBEC27 /* OSPendingCallbacks.m in Sources */,
 				DE20425E24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */,
 				7AECE59623674AB700537907 /* OSUnattributedFocusTimeProcessor.m in Sources */,
-				3C448B9E2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */,
+				3C448B9E2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */,
 				7AECE59023674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */,
 				912412361E73342200E41FD7 /* OneSignalTrackIAP.m in Sources */,
 				CA1A6E6A20DC2E31001C41B9 /* OneSignalDialogController.m in Sources */,
@@ -2815,7 +2815,7 @@
 				7AFE856C2368DDB80091D6A5 /* OSFocusCallParams.m in Sources */,
 				7A93269D25AF4F0200BBEC27 /* OSPendingCallbacks.m in Sources */,
 				DE20425F24E21C2C00350E4F /* UIApplication+OneSignal.m in Sources */,
-				3C448B9F2936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */,
+				3C448B9F2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */,
 				912412371E73342200E41FD7 /* OneSignalTrackIAP.m in Sources */,
 				7AECE59123674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */,
 				CA1A6E6B20DC2E31001C41B9 /* OneSignalDialogController.m in Sources */,
@@ -2847,7 +2847,7 @@
 				DE16C17024D3989A00670EFA /* OneSignalLifecycleObserver.m in Sources */,
 				CAAE0DFD2195216900A57402 /* OneSignalOverrider.m in Sources */,
 				CA8E190B2194FE0B009DA223 /* OSMessagingControllerOverrider.m in Sources */,
-				3C448BA02936ADFD002F96BC /* OSBackgroundTaskManagerImpl.m in Sources */,
+				3C448BA02936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */,
 				7A123295235DFE3B002B6CE3 /* OutcomeTests.m in Sources */,
 				7A4274A425D1C99600EE75FC /* SMSTests.m in Sources */,
 				CAA4ED0120646762005BD59B /* BadgeTests.m in Sources */,

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/OneSignalOSCore/Source/OSBackgroundTaskManager.swift

@@ -26,9 +26,10 @@
  */
 
 import Foundation
+import OneSignalCore
 
 @objc
-public protocol OSBackgroundTaskManagerDelegate {
+public protocol OSBackgroundTaskHandler {
     func beginBackgroundTask(_ taskIdentifier: String)
     func endBackgroundTask(_ taskIdentifier: String)
     func setTaskInvalid(_ taskIdentifier: String)
@@ -39,30 +40,30 @@ public protocol OSBackgroundTaskManagerDelegate {
 // check if Core needs to use this, then ok to live here
 @objc
 public class OSBackgroundTaskManager: NSObject {
-    @objc public static weak var delegate: OSBackgroundTaskManagerDelegate?
+    @objc public static var taskHandler: OSBackgroundTaskHandler?
 
     @objc
     public static func beginBackgroundTask(_ taskIdentifier: String) {
-        guard let delegate = delegate else {
-            // Log error, no delegate
+        guard let delegate = taskHandler else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:beginBackgroundTask \(taskIdentifier) cannot be executed due to no task handler.")
             return
         }
         delegate.beginBackgroundTask(taskIdentifier)
     }
 
     @objc
     public static func endBackgroundTask(_ taskIdentifier: String) {
-        guard let delegate = delegate else {
-            // Log error, no delegate
+        guard let delegate = taskHandler else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:endBackgroundTask \(taskIdentifier) cannot be executed due to no task handler.")
             return
         }
         delegate.endBackgroundTask(taskIdentifier)
     }
 
     @objc
     public static func setTaskInvalid(_ taskIdentifier: String) {
-        guard let delegate = delegate else {
-            // Log error, no delegate
+        guard let delegate = taskHandler else {
+            OneSignalLog.onesignalLog(.LL_ERROR, message: "OSBackgroundTaskManager:setTaskInvalid \(taskIdentifier) cannot be executed due to no task handler.")
             // But not necessarily an error because this task won't exist
             // Can be called in initialization of services before delegate is set
             return

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/OneSignalOutcomes/Source/OutcomeEvents/OneSignalOutcomeEventsController.m

@@ -109,6 +109,11 @@ - (void)sendSessionEndOutcomes:(NSNumber * _Nonnull)timeElapsed
             pushSubscriptionId:(NSString * _Nonnull)pushSubscriptionId
                    onesignalId:(NSString * _Nonnull)onesignalId
                influenceParams:(NSArray<OSFocusInfluenceParam *> * _Nonnull)influenceParams {
+    // Don't send influenced session with time < 1 seconds
+    if ([timeElapsed intValue] < 1) {
+        [OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"sendSessionEndOutcomes not sending active time %@", timeElapsed]];
+        return;
+    }
     // TODO: What to do onSuccess and onFailure
     [OneSignalClient.sharedClient executeRequest:[OSRequestSendSessionEndOutcomes
                                                   withActiveTime:timeElapsed

iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskManagerImpl.h renamed to iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskHandlerImpl.h

@@ -28,6 +28,6 @@
 #import <Foundation/Foundation.h>
 #import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 
-@interface OSBackgroundTaskManagerImpl : NSObject <OSBackgroundTaskManagerDelegate>
+@interface OSBackgroundTaskHandlerImpl : NSObject <OSBackgroundTaskHandler>
 
 @end

iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskManagerImpl.m renamed to iOS_SDK/OneSignalSDK/Source/OSBackgroundTaskHandlerImpl.m

@@ -25,12 +25,12 @@ of this software and associated documentation files (the "Software"), to deal
  THE SOFTWARE.
  */
 
-#import "OSBackgroundTaskManagerImpl.h"
+#import "OSBackgroundTaskHandlerImpl.h"
 #import <OneSignalOSCore/OneSignalOSCore-Swift.h>
 #import <OneSignalCore/OneSignalCore.h>
 #import <UIKit/UIKit.h>
 
-@implementation OSBackgroundTaskManagerImpl
+@implementation OSBackgroundTaskHandlerImpl
 
 NSMutableDictionary<NSString*, NSNumber*> *tasks;
 

iOS_SDK/OneSignalSDK/Source/OneSignal.m

@@ -38,7 +38,7 @@
 #import "UIApplicationDelegate+OneSignal.h"
 #import "OSNotification+Internal.h"
 #import "OSMigrationController.h"
-#import "OSBackgroundTaskManagerImpl.h"
+#import "OSBackgroundTaskHandlerImpl.h"
 #import "OSFocusCallParams.h"
 
 #import <OneSignalNotifications/OneSignalNotifications.h>
@@ -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];
 
@@ -490,7 +481,7 @@ + (void)init {
 
     [[OSMigrationController new] migrate];
 
-    OSBackgroundTaskManager.delegate = [OSBackgroundTaskManagerImpl new];
+    OSBackgroundTaskManager.taskHandler = [OSBackgroundTaskHandlerImpl new];
 
     [self registerForAPNsToken];
 
@@ -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]];
 }