Skip to content

Commit 8fb4a0a

Browse files
nan-linan-li
authored
refactor: route identifier reads through OneSignalIdentifiers (#1667)
1 parent ae58bad commit 8fb4a0a

53 files changed

Lines changed: 282 additions & 225 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎OneSignal.podspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,20 @@ Pod::Spec.new do |s|
2222

2323
s.subspec 'OneSignalOutcomes' do |ss|
2424
ss.dependency 'OneSignal/OneSignalCore'
25+
ss.dependency 'OneSignal/OneSignalOSCore'
2526
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
2627
end
2728

2829
s.subspec 'OneSignalExtension' do |ss|
2930
ss.dependency 'OneSignal/OneSignalCore'
31+
ss.dependency 'OneSignal/OneSignalOSCore'
3032
ss.dependency 'OneSignal/OneSignalOutcomes'
3133
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
3234
end
3335

3436
s.subspec 'OneSignalNotifications' do |ss|
3537
ss.dependency 'OneSignal/OneSignalCore'
38+
ss.dependency 'OneSignal/OneSignalOSCore'
3639
ss.dependency 'OneSignal/OneSignalOutcomes'
3740
ss.dependency 'OneSignal/OneSignalExtension'
3841
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'

‎OneSignalXCFramework.podspec‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,20 @@ Pod::Spec.new do |s|
2222

2323
s.subspec 'OneSignalOutcomes' do |ss|
2424
ss.dependency 'OneSignalXCFramework/OneSignalCore'
25+
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
2526
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Outcomes/OneSignalOutcomes.xcframework'
2627
end
2728

2829
s.subspec 'OneSignalExtension' do |ss|
2930
ss.dependency 'OneSignalXCFramework/OneSignalCore'
31+
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
3032
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
3133
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Extension/OneSignalExtension.xcframework'
3234
end
3335

3436
s.subspec 'OneSignalNotifications' do |ss|
3537
ss.dependency 'OneSignalXCFramework/OneSignalCore'
38+
ss.dependency 'OneSignalXCFramework/OneSignalOSCore'
3639
ss.dependency 'OneSignalXCFramework/OneSignalOutcomes'
3740
ss.dependency 'OneSignalXCFramework/OneSignalExtension'
3841
ss.vendored_frameworks = 'iOS_SDK/OneSignalSDK/OneSignal_Notifications/OneSignalNotifications.xcframework'

‎Package.swift‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ let package = Package(
7575
"OneSignalNotifications",
7676
"OneSignalExtension",
7777
"OneSignalOutcomes",
78+
"OneSignalOSCore",
7879
"OneSignalCore"
7980
],
8081
path: "OneSignalNotificationsWrapper"
@@ -84,6 +85,7 @@ let package = Package(
8485
dependencies: [
8586
"OneSignalExtension",
8687
"OneSignalOutcomes",
88+
"OneSignalOSCore",
8789
"OneSignalCore"
8890
],
8991
path: "OneSignalExtensionWrapper"
@@ -92,6 +94,7 @@ let package = Package(
9294
name: "OneSignalOutcomesWrapper",
9395
dependencies: [
9496
"OneSignalOutcomes",
97+
"OneSignalOSCore",
9598
"OneSignalCore"
9699
],
97100
path: "OneSignalOutcomesWrapper"

‎iOS_SDK/OneSignalSDK/OneSignal.xcodeproj/project.pbxproj‎

Lines changed: 53 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,16 @@
8787
3C448B9F2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
8888
3C448BA02936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
8989
3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */; };
90-
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C47A972292642B100312125 /* OneSignalConfigManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
91-
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C47A973292642B100312125 /* OneSignalConfigManager.m */; };
9290
3C4F9E4428A4466C009F453A /* OSOperationRepo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */; };
9391
3C5117172B15C31E00563465 /* OSUserState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5117162B15C31E00563465 /* OSUserState.swift */; };
9492
3C5501402E09CF0100E77DF7 /* OSCopyOnWriteSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C55013E2E09CF0100E77DF7 /* OSCopyOnWriteSet.h */; };
9593
3C5501412E09CF0100E77DF7 /* OSCopyOnWriteSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C55013F2E09CF0100E77DF7 /* OSCopyOnWriteSet.m */; };
9694
3C5501432E09F3D900E77DF7 /* LoggingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5501422E09F3D900E77DF7 /* LoggingTests.swift */; };
95+
3C5C6FFC2FCB8DED00102E2C /* OneSignalIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */; };
96+
3C5C6FFD2FCB933100102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
97+
3C5C70022FCB935000102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
98+
3C5C70082FCBAA5C00102E2C /* OneSignalConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */; };
99+
3C5C70092FCBB0F400102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
97100
3C60BB9B2ECF860600C765F7 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; };
98101
3C60BB9C2ECF860600C765F7 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
99102
3C62999F2BEEA34800649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */; };
@@ -665,6 +668,27 @@
665668
remoteGlobalIDString = 3C115160289A259500565C41;
666669
remoteInfo = OneSignalOSCore;
667670
};
671+
3C5C6FFF2FCB933100102E2C /* PBXContainerItemProxy */ = {
672+
isa = PBXContainerItemProxy;
673+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
674+
proxyType = 1;
675+
remoteGlobalIDString = 3C115160289A259500565C41;
676+
remoteInfo = OneSignalOSCore;
677+
};
678+
3C5C70042FCB935000102E2C /* PBXContainerItemProxy */ = {
679+
isa = PBXContainerItemProxy;
680+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
681+
proxyType = 1;
682+
remoteGlobalIDString = 3C115160289A259500565C41;
683+
remoteInfo = OneSignalOSCore;
684+
};
685+
3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */ = {
686+
isa = PBXContainerItemProxy;
687+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
688+
proxyType = 1;
689+
remoteGlobalIDString = 3C115160289A259500565C41;
690+
remoteInfo = OneSignalOSCore;
691+
};
668692
3C60BB9D2ECF860600C765F7 /* PBXContainerItemProxy */ = {
669693
isa = PBXContainerItemProxy;
670694
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
@@ -1323,13 +1347,13 @@
13231347
3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskHandlerImpl.h; sourceTree = "<group>"; };
13241348
3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskHandlerImpl.m; sourceTree = "<group>"; };
13251349
3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSBackgroundTaskManager.swift; sourceTree = "<group>"; };
1326-
3C47A972292642B100312125 /* OneSignalConfigManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalConfigManager.h; sourceTree = "<group>"; };
1327-
3C47A973292642B100312125 /* OneSignalConfigManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalConfigManager.m; sourceTree = "<group>"; };
13281350
3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSOperationRepo.swift; sourceTree = "<group>"; };
13291351
3C5117162B15C31E00563465 /* OSUserState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSUserState.swift; sourceTree = "<group>"; };
13301352
3C55013E2E09CF0100E77DF7 /* OSCopyOnWriteSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSCopyOnWriteSet.h; sourceTree = "<group>"; };
13311353
3C55013F2E09CF0100E77DF7 /* OSCopyOnWriteSet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSCopyOnWriteSet.m; sourceTree = "<group>"; };
13321354
3C5501422E09F3D900E77DF7 /* LoggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingTests.swift; sourceTree = "<group>"; };
1355+
3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalIdentifiers.swift; sourceTree = "<group>"; };
1356+
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalConfig.swift; sourceTree = "<group>"; };
13331357
3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
13341358
3C6299A02BEEA38100649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
13351359
3C6299A22BEEA3CC00649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -1964,6 +1988,7 @@
19641988
isa = PBXFrameworksBuildPhase;
19651989
buildActionMask = 2147483647;
19661990
files = (
1991+
3C5C70022FCB935000102E2C /* OneSignalOSCore.framework in Frameworks */,
19671992
DE7D1846270286C6002D3A5D /* OneSignalCore.framework in Frameworks */,
19681993
DE7D18D22703ADE0002D3A5D /* OneSignalOutcomes.framework in Frameworks */,
19691994
DE7D1843270283B9002D3A5D /* UserNotifications.framework in Frameworks */,
@@ -1974,6 +1999,7 @@
19741999
isa = PBXFrameworksBuildPhase;
19752000
buildActionMask = 2147483647;
19762001
files = (
2002+
3C5C70092FCBB0F400102E2C /* OneSignalOSCore.framework in Frameworks */,
19772003
DE7D188F27037F96002D3A5D /* OneSignalCore.framework in Frameworks */,
19782004
);
19792005
runOnlyForDeploymentPostprocessing = 0;
@@ -2048,6 +2074,7 @@
20482074
DEF7845F2912EA0D00A1F3A5 /* UserNotifications.framework in Frameworks */,
20492075
DEF784612912F5E100A1F3A5 /* UIKit.framework in Frameworks */,
20502076
DEF784422912E16F00A1F3A5 /* OneSignalCore.framework in Frameworks */,
2077+
3C5C6FFD2FCB933100102E2C /* OneSignalOSCore.framework in Frameworks */,
20512078
DE2D8F4A2947D86200844084 /* OneSignalOutcomes.framework in Frameworks */,
20522079
DE2D8F452947D85800844084 /* OneSignalExtension.framework in Frameworks */,
20532080
);
@@ -2203,6 +2230,7 @@
22032230
5BC1DE652C90BC9F00CA8807 /* Consistency */,
22042231
3C115163289A259500565C41 /* OneSignalOSCore.h */,
22052232
3C115188289ADEA300565C41 /* OSModelStore.swift */,
2233+
3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */,
22062234
3C115186289ADE7700565C41 /* OSModelStoreListener.swift */,
22072235
3C115184289ADE4F00565C41 /* OSModel.swift */,
22082236
3CF1A5622C669EA40056B3AA /* OSNewRecordsState.swift */,
@@ -2212,6 +2240,7 @@
22122240
3C8E6DF828A6D89E0031E48A /* OSOperationExecutor.swift */,
22132241
3CE5F9E2289D88DC004A156E /* OSModelStoreChangedHandler.swift */,
22142242
3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */,
2243+
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */,
22152244
3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */,
22162245
4710EA522B8FCFB200435356 /* OSDispatchQueue.swift */,
22172246
DEFB3E642BB7346D00E65DAD /* OSLiveActivities.swift */,
@@ -2729,8 +2758,6 @@
27292758
3C2DB2EF2DE6CB5E0006B905 /* OneSignalBadgeHelpers.h */,
27302759
3C2DB2F02DE6CB5E0006B905 /* OneSignalBadgeHelpers.m */,
27312760
3CE8CC4C2911ADD1000DB0D3 /* OSDeviceUtils.h */,
2732-
3C47A972292642B100312125 /* OneSignalConfigManager.h */,
2733-
3C47A973292642B100312125 /* OneSignalConfigManager.m */,
27342761
3CE8CC4D2911ADD1000DB0D3 /* OSDeviceUtils.m */,
27352762
CA70E3382023F24500019273 /* OneSignalCommonDefines.h */,
27362763
7AD8DDE8234BD3CF00747A8A /* OneSignalUserDefaults.h */,
@@ -3298,7 +3325,6 @@
32983325
3C5501402E09CF0100E77DF7 /* OSCopyOnWriteSet.h in Headers */,
32993326
DE971754274C48CF00FC409E /* OSPrivacyConsentController.h in Headers */,
33003327
3CE8CC4E2911ADD1000DB0D3 /* OSDeviceUtils.h in Headers */,
3301-
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */,
33023328
DE7D183627027AA0002D3A5D /* OneSignalLog.h in Headers */,
33033329
3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */,
33043330
3CCF44BE299B17290021964D /* OneSignalWrapper.h in Headers */,
@@ -3756,6 +3782,7 @@
37563782
dependencies = (
37573783
DE7D181B27026BEC002D3A5D /* PBXTargetDependency */,
37583784
DE7D18D52703ADE0002D3A5D /* PBXTargetDependency */,
3785+
3C5C70052FCB935000102E2C /* PBXTargetDependency */,
37593786
);
37603787
name = OneSignalExtension;
37613788
productName = OneSignalExtension;
@@ -3775,6 +3802,7 @@
37753802
);
37763803
dependencies = (
37773804
DE7D189227037F96002D3A5D /* PBXTargetDependency */,
3805+
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */,
37783806
);
37793807
name = OneSignalOutcomes;
37803808
productName = OneSignalOutcomes;
@@ -3888,6 +3916,7 @@
38883916
DEF784452912E16F00A1F3A5 /* PBXTargetDependency */,
38893917
DE2D8F482947D85800844084 /* PBXTargetDependency */,
38903918
DE2D8F4D2947D86200844084 /* PBXTargetDependency */,
3919+
3C5C70002FCB933100102E2C /* PBXTargetDependency */,
38913920
);
38923921
name = OneSignalNotifications;
38933922
productName = OneSignalNotifications;
@@ -4350,12 +4379,14 @@
43504379
3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */,
43514380
5BC1DE5E2C90B80E00CA8807 /* OSCondition.swift in Sources */,
43524381
5BC1DE5C2C90B7E600CA8807 /* OSConsistencyManager.swift in Sources */,
4382+
3C5C6FFC2FCB8DED00102E2C /* OneSignalIdentifiers.swift in Sources */,
43534383
3C115189289ADEA300565C41 /* OSModelStore.swift in Sources */,
43544384
3C115185289ADE4F00565C41 /* OSModel.swift in Sources */,
43554385
3CF1A5632C669EA40056B3AA /* OSNewRecordsState.swift in Sources */,
43564386
3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */,
43574387
5B58F09E2CC1B5C700298493 /* OSReadYourWriteData.swift in Sources */,
43584388
3C115187289ADE7700565C41 /* OSModelStoreListener.swift in Sources */,
4389+
3C5C70082FCBAA5C00102E2C /* OneSignalConfig.swift in Sources */,
43594390
5BC1DE642C90BB9000CA8807 /* OSIamFetchReadyCondition.swift in Sources */,
43604391
3CE5F9E3289D88DC004A156E /* OSModelStoreChangedHandler.swift in Sources */,
43614392
3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */,
@@ -4627,7 +4658,6 @@
46274658
DEBAAEB32A436CE800BF2C1C /* OSStubInAppMessages.m in Sources */,
46284659
DEBA2A262C20E9AA00E234DB /* OSBundleUtils.m in Sources */,
46294660
3C70FA682D0B68A100031066 /* OneSignalClientError.m in Sources */,
4630-
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */,
46314661
DE7D1874270375FF002D3A5D /* OSReattemptRequest.m in Sources */,
46324662
DE7D183427027A73002D3A5D /* OneSignalLog.m in Sources */,
46334663
DEF784642912FA5100A1F3A5 /* OSDialogInstanceManager.m in Sources */,
@@ -4795,6 +4825,21 @@
47954825
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
47964826
targetProxy = 3C115199289AF86C00565C41 /* PBXContainerItemProxy */;
47974827
};
4828+
3C5C70002FCB933100102E2C /* PBXTargetDependency */ = {
4829+
isa = PBXTargetDependency;
4830+
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
4831+
targetProxy = 3C5C6FFF2FCB933100102E2C /* PBXContainerItemProxy */;
4832+
};
4833+
3C5C70052FCB935000102E2C /* PBXTargetDependency */ = {
4834+
isa = PBXTargetDependency;
4835+
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
4836+
targetProxy = 3C5C70042FCB935000102E2C /* PBXContainerItemProxy */;
4837+
};
4838+
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */ = {
4839+
isa = PBXTargetDependency;
4840+
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
4841+
targetProxy = 3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */;
4842+
};
47984843
3C60BB9E2ECF860600C765F7 /* PBXTargetDependency */ = {
47994844
isa = PBXTargetDependency;
48004845
target = DEBAAE272A4211D900BF2C1C /* OneSignalInAppMessages */;

‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalConfigManager.h‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎iOS_SDK/OneSignalSDK/OneSignalCore/Source/OneSignalCore.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
#import <OneSignalCore/OSDialogInstanceManager.h>
5050
#import <OneSignalCore/SwizzlingForwarder.h>
5151
#import <OneSignalCore/OneSignalSelectorHelpers.h>
52-
#import <OneSignalCore/OneSignalConfigManager.h>
5352
#import <OneSignalCore/OSRemoteParamController.h>
5453
#import <OneSignalCore/OneSignalMobileProvision.h>
5554
#import <OneSignalCore/OneSignalWrapper.h>

‎iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalNotificationServiceExtensionHandler.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
*/
2727

2828
#import <OneSignalCore/OneSignalCore.h>
29+
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
2930
#import "OSMacros.h"
3031
#import <OneSignalOutcomes/OneSignalOutcomes.h>
3132
#import "OneSignalNotificationServiceExtensionHandler.h"
@@ -140,9 +141,8 @@ + (void)onNotificationReceived:(NSString *)receivedNotificationId withBlockingTa
140141
[[OSSessionManager sharedSessionManager] onNotificationReceived:receivedNotificationId];
141142

142143
// Track confirmed delivery
143-
let sharedUserDefaults = OneSignalUserDefaults.initShared;
144-
let playerId = [sharedUserDefaults getSavedStringForKey:OSUD_PUSH_SUBSCRIPTION_ID defaultValue:nil];
145-
let appId = [sharedUserDefaults getSavedStringForKey:OSUD_APP_ID defaultValue:nil];
144+
NSString *playerId = OneSignalIdentifiers.subscriptionId;
145+
NSString *appId = OneSignalIdentifiers.storedAppId;
146146
// Randomize send of confirmed deliveries to lessen traffic for high recipient notifications
147147
int randomDelay = semaphore != nil ? arc4random_uniform(MAX_CONF_DELIVERY_DELAY) : 0;
148148
[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"OneSignal onNotificationReceived sendReceiveReceipt with delay: %i", randomDelay]];

‎iOS_SDK/OneSignalSDK/OneSignalExtension/OneSignalReceiveReceiptsController.m‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#import <Foundation/Foundation.h>
2929
#import "OneSignalReceiveReceiptsController.h"
3030
#import <OneSignalCore/OneSignalCore.h>
31+
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
3132
#import "OSMacros.h"
3233
#import "OneSignalExtensionRequests.h"
3334

@@ -38,9 +39,8 @@ - (BOOL)isReceiveReceiptsEnabled {
3839
}
3940

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

4545
[self sendReceiveReceiptWithPlayerId:playerId
4646
notificationId:notificationId

0 commit comments

Comments
 (0)