Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
3C30FE362F21FBE1001B9C25 /* EarlyTriggerTrackingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C30FE352F21FBE1001B9C25 /* EarlyTriggerTrackingTests.swift */; };
3C3D34E92E95EAA5006A2924 /* LiveActivityConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C3D34E82E95EAA5006A2924 /* LiveActivityConstants.swift */; };
3C3D8D782E92DB7500C3E977 /* OSLiveActivityViewExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C3D8D772E92DB7500C3E977 /* OSLiveActivityViewExtensions.swift */; };
3C4319092F4CE9D90075492D /* SessionEndOutcomesRequestTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4319082F4CE9D90075492D /* SessionEndOutcomesRequestTests.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 /* OSBackgroundTaskHandlerImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */; };
Expand Down Expand Up @@ -1318,6 +1319,7 @@
3C30FE352F21FBE1001B9C25 /* EarlyTriggerTrackingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EarlyTriggerTrackingTests.swift; sourceTree = "<group>"; };
3C3D34E82E95EAA5006A2924 /* LiveActivityConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LiveActivityConstants.swift; sourceTree = "<group>"; };
3C3D8D772E92DB7500C3E977 /* OSLiveActivityViewExtensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSLiveActivityViewExtensions.swift; sourceTree = "<group>"; };
3C4319082F4CE9D90075492D /* SessionEndOutcomesRequestTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SessionEndOutcomesRequestTests.swift; 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>"; };
Expand Down Expand Up @@ -2586,6 +2588,7 @@
3C2C7DC2288E007E0020F9AE /* UnitTests-Bridging-Header.h */,
4746E2A62B86B64100D6324C /* LiveActivitiesSwiftTests.swift */,
4746E2AA2B8775C400D6324C /* LiveActivitiesObjcTests.m */,
3C4319082F4CE9D90075492D /* SessionEndOutcomesRequestTests.swift */,
);
path = UnitTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -4531,6 +4534,7 @@
4529DED21FA81EA800CEAB1D /* NSObjectOverrider.m in Sources */,
CA42CAC320D99CB90001F2F2 /* ProvisionalAuthorizationTests.m in Sources */,
5B58E4F8237CE7B4009401E0 /* UIDeviceOverrider.m in Sources */,
3C4319092F4CE9D90075492D /* SessionEndOutcomesRequestTests.swift in Sources */,
CA8E19022193C6B0009DA223 /* InAppMessagingIntegrationTests.m in Sources */,
CAB4112B20852E4C005A70D1 /* DelayedConsentInitializationParameters.m in Sources */,
7AECE59223674A9700537907 /* OSAttributedFocusTimeProcessor.m in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ typedef enum {ATTRIBUTED, NOT_ATTRIBUTED} FocusAttributionState;
#define focusAttributionStateString(enum) [@[@"ATTRIBUTED", @"NOT_ATTRIBUTED"] objectAtIndex:enum]

// OneSignal Background Task Identifiers
#define ATTRIBUTED_FOCUS_TASK @"ATTRIBUTED_FOCUS_TASK"
#define SESSION_OUTCOMES_TASK @"SESSION_OUTCOMES_TASK"
#define OPERATION_REPO_BACKGROUND_TASK @"OPERATION_REPO_BACKGROUND_TASK"
#define IDENTITY_EXECUTOR_BACKGROUND_TASK @"IDENTITY_EXECUTOR_BACKGROUND_TASK_"
#define PROPERTIES_EXECUTOR_BACKGROUND_TASK @"PROPERTIES_EXECUTOR_BACKGROUND_TASK_"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,12 @@ - (void)sendSessionEndOutcomes:(NSNumber * _Nonnull)timeElapsed
pushSubscriptionId:pushSubscriptionId
onesignalId:onesignalId
influenceParams:influenceParams] onSuccess:^(NSDictionary *result) {
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes attributed succeed"];
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes succeed"];
if (successBlock) {
successBlock(result);
}
} onFailure:^(OneSignalClientError *error) {
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes attributed failed"];
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"OneSignalOutcomeEventsController:sendSessionEndOutcomes failed"];
if (failureBlock) {
failureBlock(error.underlyingError);
}
Expand Down
10 changes: 5 additions & 5 deletions iOS_SDK/OneSignalSDK/Source/OSAttributedFocusTimeProcessor.m
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ @implementation OSAttributedFocusTimeProcessor {

- (instancetype)init {
self = [super init];
[OSBackgroundTaskManager setTaskInvalid:ATTRIBUTED_FOCUS_TASK];
[OSBackgroundTaskManager setTaskInvalid:SESSION_OUTCOMES_TASK];
return self;
}

Expand Down Expand Up @@ -85,7 +85,7 @@ - (void)sendOnFocusCallWithParams:(OSFocusCallParams *)params totalTimeActive:(N
return;
}

[OSBackgroundTaskManager beginBackgroundTask:ATTRIBUTED_FOCUS_TASK];
[OSBackgroundTaskManager beginBackgroundTask:SESSION_OUTCOMES_TASK];

if (params.onSessionEnded) {
[self sendBackgroundAttributedSessionTimeWithParams:params withTotalTimeActive:@(totalTimeActive)];
Expand Down Expand Up @@ -114,10 +114,10 @@ - (void)sendBackgroundAttributedSessionTimeWithParams:(OSFocusCallParams *)param
[OneSignal sendSessionEndOutcomes:totalTimeActive params:params onSuccess:^(NSDictionary *result) {
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"sendBackgroundAttributed succeed"];
[super saveUnsentActiveTime:0];
[OSBackgroundTaskManager endBackgroundTask:ATTRIBUTED_FOCUS_TASK];
[OSBackgroundTaskManager endBackgroundTask:SESSION_OUTCOMES_TASK];
} onFailure:^(NSError *error) {
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"sendBackgroundAttributed failed, will retry on next open"];
[OSBackgroundTaskManager endBackgroundTask:ATTRIBUTED_FOCUS_TASK];
[OSBackgroundTaskManager endBackgroundTask:SESSION_OUTCOMES_TASK];
}];
});
}
Expand All @@ -128,7 +128,7 @@ - (void)cancelDelayedJob {

[restCallTimer invalidate];
restCallTimer = nil;
[OSBackgroundTaskManager endBackgroundTask:ATTRIBUTED_FOCUS_TASK];
[OSBackgroundTaskManager endBackgroundTask:SESSION_OUTCOMES_TASK];
}

@end
3 changes: 0 additions & 3 deletions iOS_SDK/OneSignalSDK/Source/OSFocusTimeProcessorFactory.m
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ + (OSBaseFocusTimeProcessor *)createTimeProcessorWithInfluences:(NSArray<OSInflu
timeProcesor = [OSAttributedFocusTimeProcessor new];
break;
case NOT_ATTRIBUTED:
// TODO: Clean up, this check should be for getting and not create
if (focusEventType == END_SESSION)
break;
timeProcesor = [OSUnattributedFocusTimeProcessor new];
break;
}
Expand Down
17 changes: 17 additions & 0 deletions iOS_SDK/OneSignalSDK/Source/OSUnattributedFocusTimeProcessor.m
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,21 @@
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalOSCore/OneSignalOSCore.h>
#import "OSMacros.h"
#import "OneSignalFramework.h"
#import "OSUnattributedFocusTimeProcessor.h"
#import <OneSignalUser/OneSignalUser.h>

@interface OneSignal ()
+ (void)sendSessionEndOutcomes:(NSNumber*)totalTimeActive params:(OSFocusCallParams *)params onSuccess:(OSResultSuccessBlock _Nonnull)successBlock onFailure:(OSFailureBlock _Nonnull)failureBlock;
@end

@implementation OSUnattributedFocusTimeProcessor

static let UNATTRIBUTED_MIN_SESSION_TIME_SEC = 60;

- (instancetype)init {
self = [super init];
[OSBackgroundTaskManager setTaskInvalid:SESSION_OUTCOMES_TASK];
return self;
}

Expand Down Expand Up @@ -74,6 +80,17 @@ - (void)sendOnFocusCallWithParams:(OSFocusCallParams *)params totalTimeActive:(N
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:[NSString stringWithFormat:@"OSUnattributedFocusTimeProcessor:sendSessionTime of %@", @(totalTimeActive)]];
[OneSignalUserManagerImpl.sharedInstance sendSessionTime:@(totalTimeActive)];
[super saveUnsentActiveTime:0];

[OSBackgroundTaskManager beginBackgroundTask:SESSION_OUTCOMES_TASK];
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
[OneSignal sendSessionEndOutcomes:@(totalTimeActive) params:params onSuccess:^(NSDictionary *result) {
[OneSignalLog onesignalLog:ONE_S_LL_DEBUG message:@"sendUnattributed session end outcomes succeed"];
[OSBackgroundTaskManager endBackgroundTask:SESSION_OUTCOMES_TASK];
} onFailure:^(NSError *error) {
[OneSignalLog onesignalLog:ONE_S_LL_ERROR message:@"sendUnattributed session end outcomes failed"];
[OSBackgroundTaskManager endBackgroundTask:SESSION_OUTCOMES_TASK];
}];
});
}

- (void)cancelDelayedJob {
Expand Down
3 changes: 3 additions & 0 deletions iOS_SDK/OneSignalSDK/UnitTests/.swiftlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# in tests, we may want to force cast and throw any errors
disabled_rules:
- force_cast
110 changes: 110 additions & 0 deletions iOS_SDK/OneSignalSDK/UnitTests/SessionEndOutcomesRequestTests.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*
Modified MIT License

Copyright 2026 OneSignal

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

1. The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.

2. All copies of substantial portions of the Software may only be used in connection
with services provided by OneSignal.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/

import XCTest
import OneSignalOutcomes

class SessionEndOutcomesRequestTests: XCTestCase {

func testUnattributedInfluence() {
let influenceParam = OSFocusInfluenceParam(
paramsInfluenceIds: nil,
influenceKey: "notification_ids",
directInfluence: false,
influenceDirectKey: "direct"
)!

let request = OSRequestSendSessionEndOutcomes.withActiveTime(
120,
appId: "test-app-id",
pushSubscriptionId: "test-push-sub-id",
onesignalId: "test-onesignal-id",
influenceParams: [influenceParam]
)

XCTAssertEqual(request.path, "outcomes/measure")
XCTAssertEqual(request.method, POST)

let params = request.parameters as! [String: Any]
XCTAssertEqual(params["app_id"] as? String, "test-app-id")
XCTAssertEqual(params["id"] as? String, "os__session_duration")
XCTAssertEqual(params["session_time"] as? Int, 120)
XCTAssertEqual(params["onesignal_id"] as? String, "test-onesignal-id")

let subscription = params["subscription"] as! [String: Any]
XCTAssertEqual(subscription["id"] as? String, "test-push-sub-id")
XCTAssertEqual(subscription["type"] as? String, "iOSPush")

XCTAssertEqual(params["direct"] as? Bool, false)
XCTAssertNil(params["notification_ids"])
}

func testAttributedDirectInfluence() {
let notificationIds = ["notif-1", "notif-2"]
let influenceParam = OSFocusInfluenceParam(
paramsInfluenceIds: notificationIds,
influenceKey: "notification_ids",
directInfluence: true,
influenceDirectKey: "direct"
)!

let request = OSRequestSendSessionEndOutcomes.withActiveTime(
60,
appId: "test-app-id",
pushSubscriptionId: "test-push-sub-id",
onesignalId: "test-onesignal-id",
influenceParams: [influenceParam]
)

let params = request.parameters as! [String: Any]
XCTAssertEqual(params["direct"] as? Bool, true)
XCTAssertEqual(params["notification_ids"] as? [String], notificationIds)
XCTAssertEqual(params["session_time"] as? Int, 60)
}

func testAttributedIndirectInfluence() {
let notificationIds = ["notif-1", "notif-2", "notif-3"]
let influenceParam = OSFocusInfluenceParam(
paramsInfluenceIds: notificationIds,
influenceKey: "notification_ids",
directInfluence: false,
influenceDirectKey: "direct"
)!

let request = OSRequestSendSessionEndOutcomes.withActiveTime(
90,
appId: "test-app-id",
pushSubscriptionId: "test-push-sub-id",
onesignalId: "test-onesignal-id",
influenceParams: [influenceParam]
)

let params = request.parameters as! [String: Any]
XCTAssertEqual(params["direct"] as? Bool, false)
XCTAssertEqual(params["notification_ids"] as? [String], notificationIds)
}
}
1 change: 1 addition & 0 deletions iOS_SDK/OneSignalSDK/UnitTests/UnitTests-Bridging-Header.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
//

#import "OneSignalFramework.h"
#import "OSOutcomesRequests.h"
Loading