Skip to content

Commit 621088d

Browse files
BrandonStalnakerBrandonStalnaker
committed
address CR
1 parent f77568f commit 621088d

File tree

11 files changed

+51
-54
lines changed

11 files changed

+51
-54
lines changed

‎UnitTests/MParticleTests.m‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1214,7 +1214,7 @@ - (void)testSwitchWorkspaceKitsWithoutStop {
12141214

12151215
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, WORKSPACE_SWITCHING_DELAY), dispatch_get_main_queue(), ^{
12161216
registerNoStop.wrapperInstance = [[MPKitTestClassNoStartImmediately alloc] init];
1217-
[MParticle sharedInstance].kitContainer.kitConfigurations[@42] = [[MPKitConfiguration alloc] init];
1217+
[MParticle sharedInstance].kitContainer_PRIVATE.kitConfigurations[@42] = [[MPKitConfiguration alloc] init];
12181218

12191219
XCTAssertEqual(MPKitContainer_PRIVATE.registeredKits.count, 1);
12201220

@@ -1242,7 +1242,7 @@ - (void)testSwitchWorkspaceKitsWithStop {
12421242

12431243
dispatch_after(dispatch_time(DISPATCH_TIME_NOW, WORKSPACE_SWITCHING_DELAY), dispatch_get_main_queue(), ^{
12441244
registerWithStop.wrapperInstance = [[MPKitTestClassNoStartImmediatelyWithStop alloc] init];
1245-
[MParticle sharedInstance].kitContainer.kitConfigurations[@43] = [[MPKitConfiguration alloc] init];
1245+
[MParticle sharedInstance].kitContainer_PRIVATE.kitConfigurations[@43] = [[MPKitConfiguration alloc] init];
12461246

12471247
XCTAssertEqual(MPKitContainer_PRIVATE.registeredKits.count, 1);
12481248

‎mParticle-Apple-SDK/AppNotifications/MPAppNotificationHandler.m‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ - (void)didFailToRegisterForRemoteNotificationsWithError:(NSError *)error {
6464
[queueParameters addParameter:error];
6565

6666
dispatch_async(dispatch_get_main_queue(), ^{
67-
[[MParticle sharedInstance].kitContainer forwardSDKCall:failedRegistrationSelector
67+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:failedRegistrationSelector
6868
event:nil
6969
parameters:queueParameters
7070
messageType:MPMessageTypeUnknown
@@ -98,7 +98,7 @@ - (void)didRegisterForRemoteNotificationsWithDeviceToken:(NSData *)deviceToken {
9898
[queueParameters addParameter:deviceToken];
9999

100100
dispatch_async(dispatch_get_main_queue(), ^{
101-
[[MParticle sharedInstance].kitContainer forwardSDKCall:deviceTokenSelector
101+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:deviceTokenSelector
102102
event:nil
103103
parameters:queueParameters
104104
messageType:MPMessageTypePushRegistration
@@ -119,7 +119,7 @@ - (void)handleActionWithIdentifier:(NSString *)identifier forRemoteNotification:
119119
[queueParameters addParameter:userInfo];
120120

121121
dispatch_async(dispatch_get_main_queue(), ^{
122-
[[MParticle sharedInstance].kitContainer forwardSDKCall:handleActionWithIdentifierSelector
122+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:handleActionWithIdentifierSelector
123123
event:nil
124124
parameters:queueParameters
125125
messageType:MPMessageTypeUnknown
@@ -141,7 +141,7 @@ - (void)handleActionWithIdentifier:(NSString *)identifier forRemoteNotification:
141141
[queueParameters addParameter:responseInfo];
142142

143143
dispatch_async(dispatch_get_main_queue(), ^{
144-
[[MParticle sharedInstance].kitContainer forwardSDKCall:handleActionWithIdentifierSelector
144+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:handleActionWithIdentifierSelector
145145
event:nil
146146
parameters:queueParameters
147147
messageType:MPMessageTypeUnknown
@@ -176,7 +176,7 @@ - (void) didReceiveRemoteNotification:(NSDictionary *)userInfo {
176176
[queueParameters addParameter:userInfo];
177177

178178
dispatch_async(dispatch_get_main_queue(), ^{
179-
[[MParticle sharedInstance].kitContainer forwardSDKCall:receivedNotificationSelector
179+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:receivedNotificationSelector
180180
event:nil
181181
parameters:queueParameters
182182
messageType:MPMessageTypePushNotification
@@ -197,7 +197,7 @@ - (void)didUpdateUserActivity:(nonnull NSUserActivity *)userActivity {
197197
[queueParameters addParameter:userActivity];
198198

199199
dispatch_async(dispatch_get_main_queue(), ^{
200-
[[MParticle sharedInstance].kitContainer forwardSDKCall:didUpdateUserActivitySelector
200+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:didUpdateUserActivitySelector
201201
event:nil
202202
parameters:queueParameters
203203
messageType:MPMessageTypeUnknown
@@ -219,7 +219,7 @@ - (void)userNotificationCenter:(nonnull UNUserNotificationCenter *)center willPr
219219

220220
dispatch_async(dispatch_get_main_queue(), ^{
221221
SEL userNotificationCenterWillPresentNotification = @selector(userNotificationCenter:willPresentNotification:);
222-
NSArray<id<MPExtensionKitProtocol>> *activeKitsRegistry = [[MParticle sharedInstance].kitContainer activeKitsRegistry];
222+
NSArray<id<MPExtensionKitProtocol>> *activeKitsRegistry = [[MParticle sharedInstance].kitContainer_PRIVATE activeKitsRegistry];
223223

224224
for (id<MPExtensionKitProtocol> kitRegister in activeKitsRegistry) {
225225
if ([kitRegister.wrapperInstance respondsToSelector:userNotificationCenterWillPresentNotification]) {
@@ -254,7 +254,7 @@ - (void)userNotificationCenter:(nonnull UNUserNotificationCenter *)center didRec
254254

255255
dispatch_async(dispatch_get_main_queue(), ^{
256256
SEL userNotificationCenterDidReceiveNotificationResponse = @selector(userNotificationCenter:didReceiveNotificationResponse:);
257-
NSArray<id<MPExtensionKitProtocol>> *activeKitsRegistry = [[MParticle sharedInstance].kitContainer activeKitsRegistry];
257+
NSArray<id<MPExtensionKitProtocol>> *activeKitsRegistry = [[MParticle sharedInstance].kitContainer_PRIVATE activeKitsRegistry];
258258

259259
for (id<MPExtensionKitProtocol> kitRegister in activeKitsRegistry) {
260260
if ([kitRegister.wrapperInstance respondsToSelector:userNotificationCenterDidReceiveNotificationResponse]) {
@@ -290,7 +290,7 @@ - (BOOL)continueUserActivity:(nonnull NSUserActivity *)userActivity restorationH
290290
[queueParameters addParameter:restorationHandler];
291291

292292
dispatch_async(dispatch_get_main_queue(), ^{
293-
[[MParticle sharedInstance].kitContainer forwardSDKCall:continueUserActivitySelector
293+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:continueUserActivitySelector
294294
event:nil
295295
parameters:queueParameters
296296
messageType:MPMessageTypeUnknown
@@ -325,7 +325,7 @@ - (void)openURL:(NSURL *)url options:(NSDictionary<NSString *, id> *)options {
325325
[queueParameters addParameter:options];
326326

327327
dispatch_async(dispatch_get_main_queue(), ^{
328-
[[MParticle sharedInstance].kitContainer forwardSDKCall:openURLOptionsSelector
328+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:openURLOptionsSelector
329329
event:nil
330330
parameters:queueParameters
331331
messageType:MPMessageTypeUnknown
@@ -352,7 +352,7 @@ - (void)openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication ann
352352
[queueParameters addParameter:annotation];
353353

354354
dispatch_async(dispatch_get_main_queue(), ^{
355-
[[MParticle sharedInstance].kitContainer forwardSDKCall:openURLSourceAppAnnotationSelector
355+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardSDKCall:openURLSourceAppAnnotationSelector
356356
event:nil
357357
parameters:queueParameters
358358
messageType:MPMessageTypeUnknown

‎mParticle-Apple-SDK/Identity/MPIdentityApi.m‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,10 @@ - (void)onMPIDChange:(MPIdentityApiRequest *)request httpResponse:(MPIdentityHTT
244244
});
245245
}
246246

247-
NSArray<NSDictionary *> *kitConfig = [[MParticle sharedInstance].kitContainer.originalConfig copy];
247+
NSArray<NSDictionary *> *kitConfig = [[MParticle sharedInstance].kitContainer_PRIVATE.originalConfig copy];
248248
if (kitConfig) {
249249
dispatch_async(dispatch_get_main_queue(), ^{
250-
[[MParticle sharedInstance].kitContainer configureKits:kitConfig];
250+
[[MParticle sharedInstance].kitContainer_PRIVATE configureKits:kitConfig];
251251
});
252252
}
253253
}
@@ -256,7 +256,7 @@ - (void)forwardCallToKits:(MPIdentityApiRequest *)request identityRequestType:(M
256256
dispatch_async(dispatch_get_main_queue(), ^{
257257
switch (identityRequestType) {
258258
case MPIdentityRequestIdentify: {
259-
[[MParticle sharedInstance].kitContainer forwardIdentitySDKCall:@selector(onIdentifyComplete: request:)
259+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardIdentitySDKCall:@selector(onIdentifyComplete: request:)
260260
kitHandler:^(id<MPKitProtocol> kit, MPKitConfiguration *kitConfig) {
261261
FilteredMParticleUser *filteredUser = [[FilteredMParticleUser alloc] initWithMParticleUser:user kitConfiguration:kitConfig];
262262
FilteredMPIdentityApiRequest *filteredRequest = [[FilteredMPIdentityApiRequest alloc] initWithIdentityRequest:request kitConfiguration:kitConfig];
@@ -265,7 +265,7 @@ - (void)forwardCallToKits:(MPIdentityApiRequest *)request identityRequestType:(M
265265
break;
266266
}
267267
case MPIdentityRequestLogin: {
268-
[[MParticle sharedInstance].kitContainer forwardIdentitySDKCall:@selector(onLoginComplete: request:)
268+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardIdentitySDKCall:@selector(onLoginComplete: request:)
269269
kitHandler:^(id<MPKitProtocol> kit, MPKitConfiguration *kitConfig) {
270270
FilteredMParticleUser *filteredUser = [[FilteredMParticleUser alloc] initWithMParticleUser:user kitConfiguration:kitConfig];
271271
FilteredMPIdentityApiRequest *filteredRequest = [[FilteredMPIdentityApiRequest alloc] initWithIdentityRequest:request kitConfiguration:kitConfig];
@@ -274,7 +274,7 @@ - (void)forwardCallToKits:(MPIdentityApiRequest *)request identityRequestType:(M
274274
break;
275275
}
276276
case MPIdentityRequestLogout: {
277-
[[MParticle sharedInstance].kitContainer forwardIdentitySDKCall:@selector(onLogoutComplete: request:)
277+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardIdentitySDKCall:@selector(onLogoutComplete: request:)
278278
kitHandler:^(id<MPKitProtocol> kit, MPKitConfiguration *kitConfig) {
279279
FilteredMParticleUser *filteredUser = [[FilteredMParticleUser alloc] initWithMParticleUser:user kitConfiguration:kitConfig];
280280
FilteredMPIdentityApiRequest *filteredRequest = [[FilteredMPIdentityApiRequest alloc] initWithIdentityRequest:request kitConfiguration:kitConfig];
@@ -283,7 +283,7 @@ - (void)forwardCallToKits:(MPIdentityApiRequest *)request identityRequestType:(M
283283
break;
284284
}
285285
case MPIdentityRequestModify: {
286-
[[MParticle sharedInstance].kitContainer forwardIdentitySDKCall:@selector(onModifyComplete: request:)
286+
[[MParticle sharedInstance].kitContainer_PRIVATE forwardIdentitySDKCall:@selector(onModifyComplete: request:)
287287
kitHandler:^(id<MPKitProtocol> kit, MPKitConfiguration *kitConfig) {
288288
FilteredMParticleUser *filteredUser = [[FilteredMParticleUser alloc] initWithMParticleUser:user kitConfiguration:kitConfig];
289289
FilteredMPIdentityApiRequest *filteredRequest = [[FilteredMPIdentityApiRequest alloc] initWithIdentityRequest:request kitConfiguration:kitConfig];

0 commit comments

Comments
 (0)