Skip to content

Commit 58c8c79

Browse files
committed
Update Unattributed Time Processor to use new methods
* The time processor will not handle its own background task. * The ordering will be correct when the app is backgrounded. This time is sent to the user manager who enqueues a delta with the session time. Then the Operation Repo will start its background task and flush deltas.
1 parent 4da002e commit 58c8c79

File tree

2 files changed

+3
-17
lines changed

2 files changed

+3
-17
lines changed

iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCommonDefines.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,6 @@ typedef enum {ATTRIBUTED, NOT_ATTRIBUTED} FocusAttributionState;
192192

193193
// OneSignal Background Task Identifiers
194194
#define ATTRIBUTED_FOCUS_TASK @"ATTRIBUTED_FOCUS_TASK"
195-
#define UNATTRIBUTED_FOCUS_TASK @"UNATTRIBUTED_FOCUS_TASK"
196195
#define SEND_SESSION_TIME_TO_USER_TASK @"SEND_SESSION_TIME_TO_USER_TASK"
197196
#define OPERATION_REPO_BACKGROUND_TASK @"OPERATION_REPO_BACKGROUND_TASK"
198197
#define IDENTITY_EXECUTOR_BACKGROUND_TASK @"IDENTITY_EXECUTOR_BACKGROUND_TASK_"

iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ @implementation OSUnattributedFocusTimeProcessor
3636

3737
- (instancetype)init {
3838
self = [super init];
39-
[OSBackgroundTaskManager setTaskInvalid:UNATTRIBUTED_FOCUS_TASK];
4039
return self;
4140
}
4241

@@ -71,21 +70,9 @@ - (void)sendUnsentActiveTime:(OSFocusCallParams *)params {
7170
}
7271

7372
- (void)sendOnFocusCallWithParams:(OSFocusCallParams *)params totalTimeActive:(NSTimeInterval)totalTimeActive {
74-
// should dispatch_async?
75-
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
76-
[OSBackgroundTaskManager beginBackgroundTask:UNATTRIBUTED_FOCUS_TASK];
77-
78-
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"OSUnattributedFocusTimeProcessor:sendOnFocusCallWithParams start"];
79-
80-
[OneSignalUserManagerImpl.sharedInstance updateSessionWithSessionCount:nil sessionTime:@(totalTimeActive) refreshDeviceMetadata:false sendImmediately:true onSuccess:^{
81-
[super saveUnsentActiveTime:0];
82-
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"sendOnFocusCallWithParams unattributed succeed, saveUnsentActiveTime with 0"];
83-
[OSBackgroundTaskManager endBackgroundTask:UNATTRIBUTED_FOCUS_TASK];
84-
} onFailure:^{
85-
[OneSignalLog onesignalLog:ONE_S_LL_WARN message:@"sendOnFocusCallWithParams unattributed failed, will retry on next open"];
86-
[OSBackgroundTaskManager endBackgroundTask:UNATTRIBUTED_FOCUS_TASK];
87-
}];
88-
});
73+
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OSUnattributedFocusTimeProcessor:sendSessionTime of %@", @(totalTimeActive)]];
74+
[OneSignalUserManagerImpl.sharedInstance sendSessionTime:@(totalTimeActive)];
75+
[super saveUnsentActiveTime:0];
8976
}
9077

9178
- (void)cancelDelayedJob {

0 commit comments

Comments
 (0)