Skip to content

Commit e4cb30e

Browse files
nan-linan-li
committed
refactor: route identifier reads through OneSignalIdentifiers (#1667)
Merges main's #1667 (OneSignalIdentifiers refactor) into identity_verification_beta. Replaces OneSignalConfigManager.getAppId() with OneSignalIdentifiers.currentAppId across the codebase and restructures OSRequest* to store aliasLabel/aliasId directly. JWT alias resolution preserved on top of the new request structure.
1 parent 49064ed commit e4cb30e

53 files changed

Lines changed: 283 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
@@ -91,15 +91,18 @@
9191
3C448B9F2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
9292
3C448BA02936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */; };
9393
3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */; };
94-
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C47A972292642B100312125 /* OneSignalConfigManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
95-
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C47A973292642B100312125 /* OneSignalConfigManager.m */; };
9694
3C4F9E4428A4466C009F453A /* OSOperationRepo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */; };
9795
3C5117172B15C31E00563465 /* OSUserState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5117162B15C31E00563465 /* OSUserState.swift */; };
9896
3C5501402E09CF0100E77DF7 /* OSCopyOnWriteSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 3C55013E2E09CF0100E77DF7 /* OSCopyOnWriteSet.h */; };
9997
3C5501412E09CF0100E77DF7 /* OSCopyOnWriteSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C55013F2E09CF0100E77DF7 /* OSCopyOnWriteSet.m */; };
10098
3C5501432E09F3D900E77DF7 /* LoggingTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5501422E09F3D900E77DF7 /* LoggingTests.swift */; };
10199
3C5929E32CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5929E22CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift */; };
102100
3C5929E52CAE523E0020D6FF /* MockUserJwtInvalidatedListener.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5929E42CAE523E0020D6FF /* MockUserJwtInvalidatedListener.swift */; };
101+
3C5C6FFC2FCB8DED00102E2C /* OneSignalIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */; };
102+
3C5C6FFD2FCB933100102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
103+
3C5C70022FCB935000102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
104+
3C5C70082FCBAA5C00102E2C /* OneSignalConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */; };
105+
3C5C70092FCBB0F400102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
103106
3C60BB9B2ECF860600C765F7 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; };
104107
3C60BB9C2ECF860600C765F7 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
105108
3C62999F2BEEA34800649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */; };
@@ -678,6 +681,27 @@
678681
remoteGlobalIDString = 3C115160289A259500565C41;
679682
remoteInfo = OneSignalOSCore;
680683
};
684+
3C5C6FFF2FCB933100102E2C /* PBXContainerItemProxy */ = {
685+
isa = PBXContainerItemProxy;
686+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
687+
proxyType = 1;
688+
remoteGlobalIDString = 3C115160289A259500565C41;
689+
remoteInfo = OneSignalOSCore;
690+
};
691+
3C5C70042FCB935000102E2C /* PBXContainerItemProxy */ = {
692+
isa = PBXContainerItemProxy;
693+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
694+
proxyType = 1;
695+
remoteGlobalIDString = 3C115160289A259500565C41;
696+
remoteInfo = OneSignalOSCore;
697+
};
698+
3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */ = {
699+
isa = PBXContainerItemProxy;
700+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
701+
proxyType = 1;
702+
remoteGlobalIDString = 3C115160289A259500565C41;
703+
remoteInfo = OneSignalOSCore;
704+
};
681705
3C60BB9D2ECF860600C765F7 /* PBXContainerItemProxy */ = {
682706
isa = PBXContainerItemProxy;
683707
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
@@ -1340,15 +1364,15 @@
13401364
3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskHandlerImpl.h; sourceTree = "<group>"; };
13411365
3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskHandlerImpl.m; sourceTree = "<group>"; };
13421366
3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSBackgroundTaskManager.swift; sourceTree = "<group>"; };
1343-
3C47A972292642B100312125 /* OneSignalConfigManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OneSignalConfigManager.h; sourceTree = "<group>"; };
1344-
3C47A973292642B100312125 /* OneSignalConfigManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OneSignalConfigManager.m; sourceTree = "<group>"; };
13451367
3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSOperationRepo.swift; sourceTree = "<group>"; };
13461368
3C5117162B15C31E00563465 /* OSUserState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSUserState.swift; sourceTree = "<group>"; };
13471369
3C55013E2E09CF0100E77DF7 /* OSCopyOnWriteSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSCopyOnWriteSet.h; sourceTree = "<group>"; };
13481370
3C55013F2E09CF0100E77DF7 /* OSCopyOnWriteSet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSCopyOnWriteSet.m; sourceTree = "<group>"; };
13491371
3C5501422E09F3D900E77DF7 /* LoggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingTests.swift; sourceTree = "<group>"; };
13501372
3C5929E22CAD9EC50020D6FF /* OneSignalUserManagerImpl+OSLoggable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "OneSignalUserManagerImpl+OSLoggable.swift"; sourceTree = "<group>"; };
13511373
3C5929E42CAE523E0020D6FF /* MockUserJwtInvalidatedListener.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockUserJwtInvalidatedListener.swift; sourceTree = "<group>"; };
1374+
3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalIdentifiers.swift; sourceTree = "<group>"; };
1375+
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalConfig.swift; sourceTree = "<group>"; };
13521376
3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
13531377
3C6299A02BEEA38100649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
13541378
3C6299A22BEEA3CC00649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -1990,6 +2014,7 @@
19902014
isa = PBXFrameworksBuildPhase;
19912015
buildActionMask = 2147483647;
19922016
files = (
2017+
3C5C70022FCB935000102E2C /* OneSignalOSCore.framework in Frameworks */,
19932018
DE7D1846270286C6002D3A5D /* OneSignalCore.framework in Frameworks */,
19942019
DE7D18D22703ADE0002D3A5D /* OneSignalOutcomes.framework in Frameworks */,
19952020
DE7D1843270283B9002D3A5D /* UserNotifications.framework in Frameworks */,
@@ -2000,6 +2025,7 @@
20002025
isa = PBXFrameworksBuildPhase;
20012026
buildActionMask = 2147483647;
20022027
files = (
2028+
3C5C70092FCBB0F400102E2C /* OneSignalOSCore.framework in Frameworks */,
20032029
DE7D188F27037F96002D3A5D /* OneSignalCore.framework in Frameworks */,
20042030
);
20052031
runOnlyForDeploymentPostprocessing = 0;
@@ -2074,6 +2100,7 @@
20742100
DEF7845F2912EA0D00A1F3A5 /* UserNotifications.framework in Frameworks */,
20752101
DEF784612912F5E100A1F3A5 /* UIKit.framework in Frameworks */,
20762102
DEF784422912E16F00A1F3A5 /* OneSignalCore.framework in Frameworks */,
2103+
3C5C6FFD2FCB933100102E2C /* OneSignalOSCore.framework in Frameworks */,
20772104
DE2D8F4A2947D86200844084 /* OneSignalOutcomes.framework in Frameworks */,
20782105
DE2D8F452947D85800844084 /* OneSignalExtension.framework in Frameworks */,
20792106
);
@@ -2230,6 +2257,7 @@
22302257
3C115163289A259500565C41 /* OneSignalOSCore.h */,
22312258
3C2FF9CE2C5FCD590081293B /* Jwt */,
22322259
3C115188289ADEA300565C41 /* OSModelStore.swift */,
2260+
3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */,
22332261
3C115186289ADE7700565C41 /* OSModelStoreListener.swift */,
22342262
3C115184289ADE4F00565C41 /* OSModel.swift */,
22352263
3CF1A5622C669EA40056B3AA /* OSNewRecordsState.swift */,
@@ -2239,6 +2267,7 @@
22392267
3C8E6DF828A6D89E0031E48A /* OSOperationExecutor.swift */,
22402268
3CE5F9E2289D88DC004A156E /* OSModelStoreChangedHandler.swift */,
22412269
3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */,
2270+
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */,
22422271
3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */,
22432272
4710EA522B8FCFB200435356 /* OSDispatchQueue.swift */,
22442273
DEFB3E642BB7346D00E65DAD /* OSLiveActivities.swift */,
@@ -2792,8 +2821,6 @@
27922821
3C2DB2EF2DE6CB5E0006B905 /* OneSignalBadgeHelpers.h */,
27932822
3C2DB2F02DE6CB5E0006B905 /* OneSignalBadgeHelpers.m */,
27942823
3CE8CC4C2911ADD1000DB0D3 /* OSDeviceUtils.h */,
2795-
3C47A972292642B100312125 /* OneSignalConfigManager.h */,
2796-
3C47A973292642B100312125 /* OneSignalConfigManager.m */,
27972824
3CE8CC4D2911ADD1000DB0D3 /* OSDeviceUtils.m */,
27982825
CA70E3382023F24500019273 /* OneSignalCommonDefines.h */,
27992826
7AD8DDE8234BD3CF00747A8A /* OneSignalUserDefaults.h */,
@@ -3361,7 +3388,6 @@
33613388
3C5501402E09CF0100E77DF7 /* OSCopyOnWriteSet.h in Headers */,
33623389
DE971754274C48CF00FC409E /* OSPrivacyConsentController.h in Headers */,
33633390
3CE8CC4E2911ADD1000DB0D3 /* OSDeviceUtils.h in Headers */,
3364-
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */,
33653391
DE7D183627027AA0002D3A5D /* OneSignalLog.h in Headers */,
33663392
3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */,
33673393
3CCF44BE299B17290021964D /* OneSignalWrapper.h in Headers */,
@@ -3819,6 +3845,7 @@
38193845
dependencies = (
38203846
DE7D181B27026BEC002D3A5D /* PBXTargetDependency */,
38213847
DE7D18D52703ADE0002D3A5D /* PBXTargetDependency */,
3848+
3C5C70052FCB935000102E2C /* PBXTargetDependency */,
38223849
);
38233850
name = OneSignalExtension;
38243851
productName = OneSignalExtension;
@@ -3838,6 +3865,7 @@
38383865
);
38393866
dependencies = (
38403867
DE7D189227037F96002D3A5D /* PBXTargetDependency */,
3868+
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */,
38413869
);
38423870
name = OneSignalOutcomes;
38433871
productName = OneSignalOutcomes;
@@ -3951,6 +3979,7 @@
39513979
DEF784452912E16F00A1F3A5 /* PBXTargetDependency */,
39523980
DE2D8F482947D85800844084 /* PBXTargetDependency */,
39533981
DE2D8F4D2947D86200844084 /* PBXTargetDependency */,
3982+
3C5C70002FCB933100102E2C /* PBXTargetDependency */,
39543983
);
39553984
name = OneSignalNotifications;
39563985
productName = OneSignalNotifications;
@@ -4415,12 +4444,14 @@
44154444
3C115165289A259500565C41 /* OneSignalOSCore.docc in Sources */,
44164445
5BC1DE5E2C90B80E00CA8807 /* OSCondition.swift in Sources */,
44174446
5BC1DE5C2C90B7E600CA8807 /* OSConsistencyManager.swift in Sources */,
4447+
3C5C6FFC2FCB8DED00102E2C /* OneSignalIdentifiers.swift in Sources */,
44184448
3C115189289ADEA300565C41 /* OSModelStore.swift in Sources */,
44194449
3C115185289ADE4F00565C41 /* OSModel.swift in Sources */,
44204450
3CF1A5632C669EA40056B3AA /* OSNewRecordsState.swift in Sources */,
44214451
3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */,
44224452
5B58F09E2CC1B5C700298493 /* OSReadYourWriteData.swift in Sources */,
44234453
3C115187289ADE7700565C41 /* OSModelStoreListener.swift in Sources */,
4454+
3C5C70082FCBAA5C00102E2C /* OneSignalConfig.swift in Sources */,
44244455
5BC1DE642C90BB9000CA8807 /* OSIamFetchReadyCondition.swift in Sources */,
44254456
3CE5F9E3289D88DC004A156E /* OSModelStoreChangedHandler.swift in Sources */,
44264457
3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */,
@@ -4703,7 +4734,6 @@
47034734
DEBAAEB32A436CE800BF2C1C /* OSStubInAppMessages.m in Sources */,
47044735
DEBA2A262C20E9AA00E234DB /* OSBundleUtils.m in Sources */,
47054736
3C70FA682D0B68A100031066 /* OneSignalClientError.m in Sources */,
4706-
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */,
47074737
DE7D1874270375FF002D3A5D /* OSReattemptRequest.m in Sources */,
47084738
DE7D183427027A73002D3A5D /* OneSignalLog.m in Sources */,
47094739
DEF784642912FA5100A1F3A5 /* OSDialogInstanceManager.m in Sources */,
@@ -4871,6 +4901,21 @@
48714901
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
48724902
targetProxy = 3C115199289AF86C00565C41 /* PBXContainerItemProxy */;
48734903
};
4904+
3C5C70002FCB933100102E2C /* PBXTargetDependency */ = {
4905+
isa = PBXTargetDependency;
4906+
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
4907+
targetProxy = 3C5C6FFF2FCB933100102E2C /* PBXContainerItemProxy */;
4908+
};
4909+
3C5C70052FCB935000102E2C /* PBXTargetDependency */ = {
4910+
isa = PBXTargetDependency;
4911+
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
4912+
targetProxy = 3C5C70042FCB935000102E2C /* PBXContainerItemProxy */;
4913+
};
4914+
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */ = {
4915+
isa = PBXTargetDependency;
4916+
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
4917+
targetProxy = 3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */;
4918+
};
48744919
3C60BB9E2ECF860600C765F7 /* PBXTargetDependency */ = {
48754920
isa = PBXTargetDependency;
48764921
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]];

0 commit comments

Comments
 (0)