Skip to content

Commit eb1a421

Browse files
nan-linan-li
committed
refactor: replace OneSignalConfigManager with OneSignalConfig + OneSignalIdentifiers.currentAppId
OneSignalConfigManager held two distinct things in one ObjC class in OneSignalCore: (1) the in-memory app_id state, and (2) the SDK-readiness predicate `shouldAwaitAppIdAndLogMissingPrivacyConsent`. Split into two Swift classes in OneSignalOSCore so all identifier accessors live in one module: - `OneSignalIdentifiers.currentAppId` — in-memory app_id, replaces `OneSignalConfigManager.getAppId/setAppId`. Sits next to the existing `storedAppId` (persisted) and `subscriptionId` (persisted) accessors. - `OneSignalConfig.shouldAwaitAppIdAndLogMissingPrivacyConsent` — same semantics, now reads `OneSignalIdentifiers.currentAppId` internally. Migrate ~30 call sites across OneSignalCore (umbrella), OneSignalOSCore, OneSignalUser, OneSignalLiveActivities, OneSignalNotifications, OneSignal- Location, OneSignalInAppMessages, OneSignalOutcomes, and the main OneSignal target. Link OneSignalOSCore.framework into OneSignalInAppMessages, One- SignalLocation, and OneSignalOutcomes targets (they didn't previously).
1 parent 0789138 commit eb1a421

46 files changed

Lines changed: 184 additions & 177 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.

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

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@
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 */; };
@@ -97,6 +95,9 @@
9795
3C5C6FFC2FCB8DED00102E2C /* OneSignalIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */; };
9896
3C5C6FFD2FCB933100102E2C /* OneSignalOSCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; };
9997
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 */; };
100+
3C5C700A2FCBB0F400102E2C /* OneSignalOSCore.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3C115161289A259500565C41 /* OneSignalOSCore.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
100101
3C60BB9B2ECF860600C765F7 /* OneSignalInAppMessages.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; };
101102
3C60BB9C2ECF860600C765F7 /* OneSignalInAppMessages.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DEBAAE282A4211D900BF2C1C /* OneSignalInAppMessages.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
102103
3C62999F2BEEA34800649187 /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */; };
@@ -682,6 +683,13 @@
682683
remoteGlobalIDString = 3C115160289A259500565C41;
683684
remoteInfo = OneSignalOSCore;
684685
};
686+
3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */ = {
687+
isa = PBXContainerItemProxy;
688+
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
689+
proxyType = 1;
690+
remoteGlobalIDString = 3C115160289A259500565C41;
691+
remoteInfo = OneSignalOSCore;
692+
};
685693
3C60BB9D2ECF860600C765F7 /* PBXContainerItemProxy */ = {
686694
isa = PBXContainerItemProxy;
687695
containerPortal = 37747F8B19147D6400558FAD /* Project object */;
@@ -1164,6 +1172,17 @@
11641172
);
11651173
runOnlyForDeploymentPostprocessing = 0;
11661174
};
1175+
3C5C700D2FCBB0F400102E2C /* Embed Frameworks */ = {
1176+
isa = PBXCopyFilesBuildPhase;
1177+
buildActionMask = 2147483647;
1178+
dstPath = "";
1179+
dstSubfolderSpec = 10;
1180+
files = (
1181+
3C5C700A2FCBB0F400102E2C /* OneSignalOSCore.framework in Embed Frameworks */,
1182+
);
1183+
name = "Embed Frameworks";
1184+
runOnlyForDeploymentPostprocessing = 0;
1185+
};
11671186
3C60BB9F2ECF860600C765F7 /* Embed Frameworks */ = {
11681187
isa = PBXCopyFilesBuildPhase;
11691188
buildActionMask = 2147483647;
@@ -1340,14 +1359,13 @@
13401359
3C448B9B2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSBackgroundTaskHandlerImpl.h; sourceTree = "<group>"; };
13411360
3C448B9C2936ADFD002F96BC /* OSBackgroundTaskHandlerImpl.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSBackgroundTaskHandlerImpl.m; sourceTree = "<group>"; };
13421361
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>"; };
13451362
3C4F9E4328A4466C009F453A /* OSOperationRepo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSOperationRepo.swift; sourceTree = "<group>"; };
13461363
3C5117162B15C31E00563465 /* OSUserState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSUserState.swift; sourceTree = "<group>"; };
13471364
3C55013E2E09CF0100E77DF7 /* OSCopyOnWriteSet.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OSCopyOnWriteSet.h; sourceTree = "<group>"; };
13481365
3C55013F2E09CF0100E77DF7 /* OSCopyOnWriteSet.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = OSCopyOnWriteSet.m; sourceTree = "<group>"; };
13491366
3C5501422E09F3D900E77DF7 /* LoggingTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LoggingTests.swift; sourceTree = "<group>"; };
13501367
3C5C6FFB2FCB8DED00102E2C /* OneSignalIdentifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalIdentifiers.swift; sourceTree = "<group>"; };
1368+
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OneSignalConfig.swift; sourceTree = "<group>"; };
13511369
3C62999E2BEEA34800649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
13521370
3C6299A02BEEA38100649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
13531371
3C6299A22BEEA3CC00649187 /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
@@ -1993,6 +2011,7 @@
19932011
isa = PBXFrameworksBuildPhase;
19942012
buildActionMask = 2147483647;
19952013
files = (
2014+
3C5C70092FCBB0F400102E2C /* OneSignalOSCore.framework in Frameworks */,
19962015
DE7D188F27037F96002D3A5D /* OneSignalCore.framework in Frameworks */,
19972016
);
19982017
runOnlyForDeploymentPostprocessing = 0;
@@ -2233,6 +2252,7 @@
22332252
3C8E6DF828A6D89E0031E48A /* OSOperationExecutor.swift */,
22342253
3CE5F9E2289D88DC004A156E /* OSModelStoreChangedHandler.swift */,
22352254
3C2D8A5828B4C4E300BE41F6 /* OSDelta.swift */,
2255+
3C5C70072FCBAA5C00102E2C /* OneSignalConfig.swift */,
22362256
3C448BA12936B474002F96BC /* OSBackgroundTaskManager.swift */,
22372257
4710EA522B8FCFB200435356 /* OSDispatchQueue.swift */,
22382258
DEFB3E642BB7346D00E65DAD /* OSLiveActivities.swift */,
@@ -2750,8 +2770,6 @@
27502770
3C2DB2EF2DE6CB5E0006B905 /* OneSignalBadgeHelpers.h */,
27512771
3C2DB2F02DE6CB5E0006B905 /* OneSignalBadgeHelpers.m */,
27522772
3CE8CC4C2911ADD1000DB0D3 /* OSDeviceUtils.h */,
2753-
3C47A972292642B100312125 /* OneSignalConfigManager.h */,
2754-
3C47A973292642B100312125 /* OneSignalConfigManager.m */,
27552773
3CE8CC4D2911ADD1000DB0D3 /* OSDeviceUtils.m */,
27562774
CA70E3382023F24500019273 /* OneSignalCommonDefines.h */,
27572775
7AD8DDE8234BD3CF00747A8A /* OneSignalUserDefaults.h */,
@@ -3319,7 +3337,6 @@
33193337
3C5501402E09CF0100E77DF7 /* OSCopyOnWriteSet.h in Headers */,
33203338
DE971754274C48CF00FC409E /* OSPrivacyConsentController.h in Headers */,
33213339
3CE8CC4E2911ADD1000DB0D3 /* OSDeviceUtils.h in Headers */,
3322-
3C47A974292642B100312125 /* OneSignalConfigManager.h in Headers */,
33233340
DE7D183627027AA0002D3A5D /* OneSignalLog.h in Headers */,
33243341
3C44673F296D09CC0039A49E /* OneSignalMobileProvision.h in Headers */,
33253342
3CCF44BE299B17290021964D /* OneSignalWrapper.h in Headers */,
@@ -3792,11 +3809,13 @@
37923809
DE7D187C27037F43002D3A5D /* Sources */,
37933810
DE7D187D27037F43002D3A5D /* Frameworks */,
37943811
DE7D187E27037F43002D3A5D /* Resources */,
3812+
3C5C700D2FCBB0F400102E2C /* Embed Frameworks */,
37953813
);
37963814
buildRules = (
37973815
);
37983816
dependencies = (
37993817
DE7D189227037F96002D3A5D /* PBXTargetDependency */,
3818+
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */,
38003819
);
38013820
name = OneSignalOutcomes;
38023821
productName = OneSignalOutcomes;
@@ -4380,6 +4399,7 @@
43804399
3C448BA22936B474002F96BC /* OSBackgroundTaskManager.swift in Sources */,
43814400
5B58F09E2CC1B5C700298493 /* OSReadYourWriteData.swift in Sources */,
43824401
3C115187289ADE7700565C41 /* OSModelStoreListener.swift in Sources */,
4402+
3C5C70082FCBAA5C00102E2C /* OneSignalConfig.swift in Sources */,
43834403
5BC1DE642C90BB9000CA8807 /* OSIamFetchReadyCondition.swift in Sources */,
43844404
3CE5F9E3289D88DC004A156E /* OSModelStoreChangedHandler.swift in Sources */,
43854405
3C2D8A5928B4C4E300BE41F6 /* OSDelta.swift in Sources */,
@@ -4651,7 +4671,6 @@
46514671
DEBAAEB32A436CE800BF2C1C /* OSStubInAppMessages.m in Sources */,
46524672
DEBA2A262C20E9AA00E234DB /* OSBundleUtils.m in Sources */,
46534673
3C70FA682D0B68A100031066 /* OneSignalClientError.m in Sources */,
4654-
3C47A975292642B100312125 /* OneSignalConfigManager.m in Sources */,
46554674
DE7D1874270375FF002D3A5D /* OSReattemptRequest.m in Sources */,
46564675
DE7D183427027A73002D3A5D /* OneSignalLog.m in Sources */,
46574676
DEF784642912FA5100A1F3A5 /* OSDialogInstanceManager.m in Sources */,
@@ -4829,6 +4848,11 @@
48294848
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
48304849
targetProxy = 3C5C70042FCB935000102E2C /* PBXContainerItemProxy */;
48314850
};
4851+
3C5C700C2FCBB0F400102E2C /* PBXTargetDependency */ = {
4852+
isa = PBXTargetDependency;
4853+
target = 3C115160289A259500565C41 /* OneSignalOSCore */;
4854+
targetProxy = 3C5C700B2FCBB0F400102E2C /* PBXContainerItemProxy */;
4855+
};
48324856
3C60BB9E2ECF860600C765F7 /* PBXTargetDependency */ = {
48334857
isa = PBXTargetDependency;
48344858
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/OneSignalInAppMessages/Controller/OSInAppMessageController.m‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#import "OSInAppMessageController.h"
2929
#import <OneSignalCore/OneSignalCore.h>
30+
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
3031
#import "OSMacros.h"
3132
#import <OneSignalUser/OneSignalUser.h>
3233
#import "OSInAppMessagingDefines.h"
@@ -45,15 +46,15 @@ - (void)loadMessageHTMLContentWithResult:(OSResultSuccessBlock _Nullable)success
4546
return;
4647
}
4748

48-
let request = [OSRequestLoadInAppMessageContent withAppId:[OneSignalConfigManager getAppId] withMessageId:self.messageId withVariantId:variantId];
49+
let request = [OSRequestLoadInAppMessageContent withAppId:OneSignalIdentifiers.currentAppId withMessageId:self.messageId withVariantId:variantId];
4950

5051
[OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {
5152
failureBlock(error.underlyingError);
5253
}];
5354
}
5455

5556
- (void)loadPreviewMessageHTMLContentWithUUID:(NSString * _Nonnull)previewUUID success:(OSResultSuccessBlock _Nullable)successBlock failure:(OSFailureBlock _Nullable)failureBlock {
56-
let request = [OSRequestLoadInAppMessagePreviewContent withAppId:[OneSignalConfigManager getAppId] previewUUID:previewUUID];
57+
let request = [OSRequestLoadInAppMessagePreviewContent withAppId:OneSignalIdentifiers.currentAppId previewUUID:previewUUID];
5758

5859
[OneSignalCoreImpl.sharedClient executeRequest:request onSuccess:successBlock onFailure:^(OneSignalClientError *error) {
5960
failureBlock(error.underlyingError);

‎iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Controller/OSMessagingController.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ - (void)messageViewPageImpressionRequest:(OSInAppMessageInternal *)message withP
643643

644644
[OneSignalLog onesignalLog:ONE_S_LL_VERBOSE message:[NSString stringWithFormat:@"Page Impression Request page id: %@",pageId]];
645645
// Create the request and attach a payload to it
646-
let metricsRequest = [OSRequestInAppMessagePageViewed withAppId:OneSignalConfigManager.getAppId
646+
let metricsRequest = [OSRequestInAppMessagePageViewed withAppId:OneSignalIdentifiers.currentAppId
647647
withPlayerId:OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId
648648
withMessageId:message.messageId
649649
withPageId:pageId
@@ -683,7 +683,7 @@ - (void)messageViewImpressionRequest:(OSInAppMessageInternal *)message {
683683
[self.impressionedInAppMessages addObject:message.messageId];
684684

685685
// Create the request and attach a payload to it
686-
let metricsRequest = [OSRequestInAppMessageViewed withAppId:OneSignalConfigManager.getAppId
686+
let metricsRequest = [OSRequestInAppMessageViewed withAppId:OneSignalIdentifiers.currentAppId
687687
withPlayerId:OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId
688688
withMessageId:message.messageId
689689
forVariantId:message.variantId];
@@ -1094,7 +1094,7 @@ - (void)sendClickRESTCall:(OSInAppMessageInternal *)message withAction:(OSInAppM
10941094
// Track clickId per IAM
10951095
[message addClickId:clickId];
10961096

1097-
let metricsRequest = [OSRequestInAppMessageClicked withAppId:OneSignalConfigManager.getAppId
1097+
let metricsRequest = [OSRequestInAppMessageClicked withAppId:OneSignalIdentifiers.currentAppId
10981098
withPlayerId:OneSignalUserManagerImpl.sharedInstance.pushSubscriptionId
10991099
withMessageId:message.messageId
11001100
forVariantId:message.variantId
@@ -1140,7 +1140,7 @@ - (void)sendClickActionOutcomes:(NSArray<OSInAppMessageOutcome *> *)outcomes {
11401140
return;
11411141
}
11421142

1143-
[OSOutcomes.sharedController sendClickActionOutcomes:outcomes appId:OneSignalConfigManager.getAppId deviceType:[NSNumber numberWithInt:DEVICE_TYPE_PUSH]];
1143+
[OSOutcomes.sharedController sendClickActionOutcomes:outcomes appId:OneSignalIdentifiers.currentAppId deviceType:[NSNumber numberWithInt:DEVICE_TYPE_PUSH]];
11441144
}
11451145

11461146
/*

‎iOS_SDK/OneSignalSDK/OneSignalInAppMessages/Requests/OSInAppMessagingRequests.m‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ of this software and associated documentation files (the "Software"), to deal
2525
THE SOFTWARE.
2626
*/
2727
#import <Foundation/Foundation.h>
28+
#import <OneSignalOSCore/OneSignalOSCore-Swift.h>
2829
#import "OSInAppMessagingRequests.h"
2930
#import "OSMacros.h"
3031

@@ -54,7 +55,7 @@ + (instancetype _Nonnull) withSubscriptionId:(NSString * _Nonnull)subscription
5455

5556
request.additionalHeaders = headers;
5657

57-
NSString *appId = [OneSignalConfigManager getAppId];
58+
NSString *appId = OneSignalIdentifiers.currentAppId;
5859
request.path = [NSString stringWithFormat:@"apps/%@/subscriptions/%@/iams", appId, subscriptionId];
5960
return request;
6061
}

‎iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/EarlyTriggerTrackingTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ final class EarlyTriggerTrackingTests: XCTestCase {
5353
OSMessagingController.removeInstance()
5454

5555
// Set up basic configuration
56-
OneSignalConfigManager.setAppId(testAppId)
56+
OneSignalIdentifiers.currentAppId = testAppId
5757
OneSignalLog.setLogLevel(.LL_VERBOSE)
5858
}
5959

‎iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/IAMIntegrationTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ final class IAMIntegrationTests: XCTestCase {
5555
/* Setup */
5656
OneSignalCoreImpl.setSharedClient(MockOneSignalClient())
5757
// App ID is set because there are guards against nil App ID
58-
OneSignalConfigManager.setAppId("test-app-id")
58+
OneSignalIdentifiers.currentAppId = "test-app-id"
5959

6060
// 1. Pause IAMs
6161
OneSignalInAppMessages.__paused(true)
@@ -82,7 +82,7 @@ final class IAMIntegrationTests: XCTestCase {
8282
OneSignalCoreImpl.setSharedClient(client)
8383

8484
// 1. App ID is set because there are guards against nil App ID
85-
OneSignalConfigManager.setAppId("test-app-id")
85+
OneSignalIdentifiers.currentAppId = "test-app-id"
8686

8787
// 2. Set up mock responses for the anonymous user, as the user needs an OSID
8888
MockUserRequests.setDefaultCreateAnonUserResponses(with: client)

‎iOS_SDK/OneSignalSDK/OneSignalInAppMessagesTests/OSMessagingControllerUserStateTests.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ final class OSMessagingControllerUserStateTests: XCTestCase {
5454
OSMessagingController.removeInstance()
5555

5656
// Set up basic configuration
57-
OneSignalConfigManager.setAppId(testAppId)
57+
OneSignalIdentifiers.currentAppId = testAppId
5858
OneSignalLog.setLogLevel(.LL_VERBOSE)
5959
}
6060

‎iOS_SDK/OneSignalSDK/OneSignalLiveActivities/Source/Requests/OSRequestLiveActivityClicked.swift‎

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

2828
import OneSignalCore
29+
import OneSignalOSCore
2930
import OneSignalUser
3031

3132
class OSRequestLiveActivityClicked: OneSignalRequest, OSLiveActivityRequest {
@@ -39,7 +40,7 @@ class OSRequestLiveActivityClicked: OneSignalRequest, OSLiveActivityRequest {
3940
var shouldForgetWhenSuccessful: Bool = true
4041

4142
func prepareForExecution() -> Bool {
42-
guard let appId = OneSignalConfigManager.getAppId() else {
43+
guard let appId = OneSignalIdentifiers.currentAppId else {
4344
OneSignalLog.onesignalLog(.LL_DEBUG, message: "Cannot generate the OSRequestLiveActivityClicked due to null app ID.")
4445
return false
4546
}

0 commit comments

Comments
 (0)