Skip to content

refactor: route identifier reads through OneSignalIdentifiers #1667

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nan-li wants to merge 5 commits into
base: main
Choose a base branch
from
Open

refactor: route identifier reads through OneSignalIdentifiers #1667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
21ed813
refactor: route identifier reads through OneSignalIdentifiers
nan-li May 30, 2026
0789138
refactor: drop redundant OSNotificationsManager pushSubscriptionId cache
nan-li May 30, 2026
597799c
refactor: replace OneSignalConfigManager with OneSignalConfig + OneSi…
nan-li May 31, 2026
898cde1
build: declare OneSignalOSCore dep for Extension/Notifications/Outcomes
nan-li Jun 1, 2026
7251691
nit: spacing
nan-li Jun 1, 2026
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
3 changes: 3 additions & 0 deletions OneSignal.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,20 @@ Pod::Spec.new do |s|

s.subspec 'OneSignalOutcomes' do |ss|
ss.dependency 'OneSignal/OneSignalCore'
ss.dependency 'OneSignal/OneSignalOSCore'
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
end

s.subspec 'OneSignalExtension' do |ss|
ss.dependency 'OneSignal/OneSignalCore'
ss.dependency 'OneSignal/OneSignalOSCore'
ss.dependency 'OneSignal/OneSignalOutcomes'
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
end

s.subspec 'OneSignalNotifications' do |ss|
ss.dependency 'OneSignal/OneSignalCore'
ss.dependency 'OneSignal/OneSignalOSCore'
ss.dependency 'OneSignal/OneSignalOutcomes'
ss.dependency 'OneSignal/OneSignalExtension'
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'
Expand Down
3 changes: 3 additions & 0 deletions OneSignalXCFramework.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,20 @@ Pod::Spec.new do |s|

s.subspec 'OneSignalOutcomes' do |ss|
ss.dependency 'OneSignalXCFramework/OneSignalCore'
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
end

s.subspec 'OneSignalExtension' do |ss|
ss.dependency 'OneSignalXCFramework/OneSignalCore'
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
end

s.subspec 'OneSignalNotifications' do |ss|
ss.dependency 'OneSignalXCFramework/OneSignalCore'
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
ss.dependency 'OneSignalXCFramework/OneSignalExtension'
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'
Expand Down
3 changes: 3 additions & 0 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ let package = Package(
"OneSignalNotifications",
"OneSignalExtension",
"OneSignalOutcomes",
"OneSignalOSCore",
"OneSignalCore"
],
path: "OneSignalNotificationsWrapper"
Expand All @@ -84,6 +85,7 @@ let package = Package(
dependencies: [
"OneSignalExtension",
"OneSignalOutcomes",
"OneSignalOSCore",
"OneSignalCore"
],
path: "OneSignalExtensionWrapper"
Expand All @@ -92,6 +94,7 @@ let package = Package(
name: "OneSignalOutcomesWrapper",
dependencies: [
"OneSignalOutcomes",
"OneSignalOSCore",
"OneSignalCore"
],
path: "OneSignalOutcomesWrapper"
Expand Down
61 changes: 53 additions & 8 deletions iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,16 @@
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 */; };
3C4F9E4428A4466C009F453A /* OSOperationRepo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */; };
3C5117172B15C31E00563465 /* OSUserState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5117162B15C31E00563465 /* OSUserState.swift */; };
3C5501402E09CF0100E77DF7 /* OSCopyOnWriteSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C55013E2E09CF0100E77DF7 /* OSCopyOnWriteSet.h */; };
3C5501412E09CF0100E77DF7 /* OSCopyOnWriteSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C55013F2E09CF0100E77DF7 /* OSCopyOnWriteSet.m */; };
3C5501432E09F3D900E77DF7 /* LoggingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5501422E09F3D900E77DF7 /* LoggingTests.swift */; };
3C5C6FFC2FCB8DED00102E2C /* OneSignalIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */; };
3C5C6FFD2FCB933100102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
3C5C70022FCB935000102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
3C5C70082FCBAA5C00102E2C /* OneSignalConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */; };
3C5C70092FCBB0F400102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
3C60BB9B2ECF860600C765F7 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; };
3C60BB9C2ECF860600C765F7 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
3C62999F2BEEA34800649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */; };
Expand Down Expand Up @@ -665,6 +668,27 @@
remoteGlobalIDString = 3C115160289A259500565C41;
remoteInfo = OneSignalOSCore;
};
3C5C6FFF2FCB933100102E2C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3C115160289A259500565C41;
remoteInfo = OneSignalOSCore;
};
3C5C70042FCB935000102E2C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3C115160289A259500565C41;
remoteInfo = OneSignalOSCore;
};
3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3C115160289A259500565C41;
remoteInfo = OneSignalOSCore;
};
3C60BB9D2ECF860600C765F7 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
Expand Down Expand Up @@ -1323,13 +1347,13 @@
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>"; };
3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSOperationRepo.swift; sourceTree = "<group>"; };
3C5117162B15C31E00563465 /* OSUserState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSUserState.swift; sourceTree = "<group>"; };
3C55013E2E09CF0100E77DF7 /* OSCopyOnWriteSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSCopyOnWriteSet.h; sourceTree = "<group>"; };
3C55013F2E09CF0100E77DF7 /* OSCopyOnWriteSet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSCopyOnWriteSet.m; sourceTree = "<group>"; };
3C5501422E09F3D900E77DF7 /* LoggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingTests.swift; sourceTree = "<group>"; };
3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalIdentifiers.swift; sourceTree = "<group>"; };
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalConfig.swift; sourceTree = "<group>"; };
3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
3C6299A02BEEA38100649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
3C6299A22BEEA3CC00649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1964,6 +1988,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3C5C70022FCB935000102E2C /* OneSignalOSCore.framework in Frameworks */,
Comment thread
claude[bot] marked this conversation as resolved.
DE7D1846270286C6002D3A5D /* OneSignalCore.framework in Frameworks */,
DE7D18D22703ADE0002D3A5D /* OneSignalOutcomes.framework in Frameworks */,
DE7D1843270283B9002D3A5D /* UserNotifications.framework in Frameworks */,
Expand All @@ -1974,6 +1999,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3C5C70092FCBB0F400102E2C /* OneSignalOSCore.framework in Frameworks */,
DE7D188F27037F96002D3A5D /* OneSignalCore.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -2048,6 +2074,7 @@
DEF7845F2912EA0D00A1F3A5 /* UserNotifications.framework in Frameworks */,
DEF784612912F5E100A1F3A5 /* UIKit.framework in Frameworks */,
DEF784422912E16F00A1F3A5 /* OneSignalCore.framework in Frameworks */,
3C5C6FFD2FCB933100102E2C /* OneSignalOSCore.framework in Frameworks */,
DE2D8F4A2947D86200844084 /* OneSignalOutcomes.framework in Frameworks */,
DE2D8F452947D85800844084 /* OneSignalExtension.framework in Frameworks */,
);
Expand Down Expand Up @@ -2203,6 +2230,7 @@
5BC1DE652C90BC9F00CA8807 /* Consistency */,
3C115163289A259500565C41 /* OneSignalOSCore.h */,
3C115188289ADEA300565C41 /* OSModelStore.swift */,
3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */,
3C115186289ADE7700565C41 /* OSModelStoreListener.swift */,
3C115184289ADE4F00565C41 /* OSModel.swift */,
3CF1A5622C669EA40056B3AA /* OSNewRecordsState.swift */,
Expand All @@ -2212,6 +2240,7 @@
3C8E6DF828A6D89E0031E48A /* OSOperationExecutor.swift */,
3CE5F9E2289D88DC004A156E /* OSModelStoreChangedHandler.swift */,
3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */,
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */,
3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */,
4710EA522B8FCFB200435356 /* OSDispatchQueue.swift */,
DEFB3E642BB7346D00E65DAD /* OSLiveActivities.swift */,
Expand Down Expand Up @@ -2729,8 +2758,6 @@
3C2DB2EF2DE6CB5E0006B905 /* OneSignalBadgeHelpers.h */,
3C2DB2F02DE6CB5E0006B905 /* OneSignalBadgeHelpers.m */,
3CE8CC4C2911ADD1000DB0D3 /* OSDeviceUtils.h */,
3C47A972292642B100312125 /* OneSignalConfigManager.h */,
3C47A973292642B100312125 /* OneSignalConfigManager.m */,
3CE8CC4D2911ADD1000DB0D3 /* OSDeviceUtils.m */,
CA70E3382023F24500019273 /* OneSignalCommonDefines.h */,
7AD8DDE8234BD3CF00747A8A /* OneSignalUserDefaults.h */,
Expand Down Expand Up @@ -3298,7 +3325,6 @@
3C5501402E09CF0100E77DF7 /* OSCopyOnWriteSet.h in Headers */,
DE971754274C48CF00FC409E /* OSPrivacyConsentController.h in Headers */,
3CE8CC4E2911ADD1000DB0D3 /* OSDeviceUtils.h in Headers */,
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */,
DE7D183627027AA0002D3A5D /* OneSignalLog.h in Headers */,
3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */,
3CCF44BE299B17290021964D /* OneSignalWrapper.h in Headers */,
Expand Down Expand Up @@ -3756,6 +3782,7 @@
dependencies = (
DE7D181B27026BEC002D3A5D /* PBXTargetDependency */,
DE7D18D52703ADE0002D3A5D /* PBXTargetDependency */,
3C5C70052FCB935000102E2C /* PBXTargetDependency */,
);
name = OneSignalExtension;
productName = OneSignalExtension;
Expand All @@ -3775,6 +3802,7 @@
);
dependencies = (
DE7D189227037F96002D3A5D /* PBXTargetDependency */,
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */,
);
name = OneSignalOutcomes;
productName = OneSignalOutcomes;
Expand Down Expand Up @@ -3888,6 +3916,7 @@
DEF784452912E16F00A1F3A5 /* PBXTargetDependency */,
DE2D8F482947D85800844084 /* PBXTargetDependency */,
DE2D8F4D2947D86200844084 /* PBXTargetDependency */,
3C5C70002FCB933100102E2C /* PBXTargetDependency */,
);
name = OneSignalNotifications;
productName = OneSignalNotifications;
Expand Down Expand Up @@ -4350,12 +4379,14 @@
3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */,
5BC1DE5E2C90B80E00CA8807 /* OSCondition.swift in Sources */,
5BC1DE5C2C90B7E600CA8807 /* OSConsistencyManager.swift in Sources */,
3C5C6FFC2FCB8DED00102E2C /* OneSignalIdentifiers.swift in Sources */,
3C115189289ADEA300565C41 /* OSModelStore.swift in Sources */,
3C115185289ADE4F00565C41 /* OSModel.swift in Sources */,
3CF1A5632C669EA40056B3AA /* OSNewRecordsState.swift in Sources */,
3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */,
5B58F09E2CC1B5C700298493 /* OSReadYourWriteData.swift in Sources */,
3C115187289ADE7700565C41 /* OSModelStoreListener.swift in Sources */,
3C5C70082FCBAA5C00102E2C /* OneSignalConfig.swift in Sources */,
5BC1DE642C90BB9000CA8807 /* OSIamFetchReadyCondition.swift in Sources */,
3CE5F9E3289D88DC004A156E /* OSModelStoreChangedHandler.swift in Sources */,
3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */,
Expand Down Expand Up @@ -4627,7 +4658,6 @@
DEBAAEB32A436CE800BF2C1C /* OSStubInAppMessages.m in Sources */,
DEBA2A262C20E9AA00E234DB /* OSBundleUtils.m in Sources */,
3C70FA682D0B68A100031066 /* OneSignalClientError.m in Sources */,
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */,
DE7D1874270375FF002D3A5D /* OSReattemptRequest.m in Sources */,
DE7D183427027A73002D3A5D /* OneSignalLog.m in Sources */,
DEF784642912FA5100A1F3A5 /* OSDialogInstanceManager.m in Sources */,
Expand Down Expand Up @@ -4795,6 +4825,21 @@
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
targetProxy = 3C115199289AF86C00565C41 /* PBXContainerItemProxy */;
};
3C5C70002FCB933100102E2C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
targetProxy = 3C5C6FFF2FCB933100102E2C /* PBXContainerItemProxy */;
};
3C5C70052FCB935000102E2C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
targetProxy = 3C5C70042FCB935000102E2C /* PBXContainerItemProxy */;
};
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
targetProxy = 3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */;
};
3C60BB9E2ECF860600C765F7 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = DEBAAE272A4211D900BF2C1C /* OneSignalInAppMessages */;
Expand Down
36 changes: 0 additions & 36 deletions iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalConfigManager.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@
#import <OneSignalCore/OSDialogInstanceManager.h>
#import <OneSignalCore/SwizzlingForwarder.h>
#import <OneSignalCore/OneSignalSelectorHelpers.h>
#import <OneSignalCore/OneSignalConfigManager.h>
#import <OneSignalCore/OSRemoteParamController.h>
#import <OneSignalCore/OneSignalMobileProvision.h>
#import <OneSignalCore/OneSignalWrapper.h>
Expand Down
6 changes: 3 additions & 3 deletions iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/

#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
#import "OSMacros.h"
#import <OneSignalOutcomes/OneSignalOutcomes.h>
#import "OneSignalNotificationServiceExtensionHandler.h"
Expand Down Expand Up @@ -140,9 +141,8 @@ + (void)onNotificationReceived:(NSString *)receivedNotificationId withBlockingTa
[[OSSessionManager sharedSessionManager] onNotificationReceived:receivedNotificationId];

// Track confirmed delivery
let sharedUserDefaults = OneSignalUserDefaults.initShared;
let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
NSString *playerId = OneSignalIdentifiers.subscriptionId;
NSString *appId = OneSignalIdentifiers.storedAppId;
// Randomize send of confirmed deliveries to lessen traffic for high recipient notifications
int randomDelay = semaphore != nil ? arc4random_uniform(MAX_CONF_DELIVERY_DELAY) : 0;
[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal onNotificationReceived sendReceiveReceipt with delay: %i", randomDelay]];
Expand Down
6 changes: 3 additions & 3 deletions iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#import <Foundation/Foundation.h>
#import "OneSignalReceiveReceiptsController.h"
#import <OneSignalCore/OneSignalCore.h>
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
#import "OSMacros.h"
#import "OneSignalExtensionRequests.h"

Expand All @@ -38,9 +39,8 @@ - (BOOL)isReceiveReceiptsEnabled {
}

- (void)sendReceiveReceiptWithNotificationId:(NSString *)notificationId {
let sharedUserDefaults = OneSignalUserDefaults.initShared;
let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
NSString *playerId = OneSignalIdentifiers.subscriptionId;
NSString *appId = OneSignalIdentifiers.storedAppId;

[self sendReceiveReceiptWithPlayerId:playerId
notificationId:notificationId
Expand Down
Loading
Loading