Skip to content

refactor: MPKitConfiguration pure objc #513

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
nickolas-dimitrakas wants to merge 2 commits into
base: workstation/9.0-Release
Choose a base branch
from
+20 −24
Open

refactor: MPKitConfiguration pure objc #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0fdedc7
refactor: MPKitConfiguration pure objc
nickolas-dimitrakas Jan 20, 2026
ddd88eb
Merge branch 'workstation/9.0-Release' into refactor/MPKitConfigurati…
jamesnrokt Jan 21, 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
0 ...ests/ObjCTests/MPKitConfigurationTests.mm → ...Tests/ObjCTests/MPKitConfigurationTests.m
View file
Open in desktop
File renamed without changes.
16 changes: 8 additions & 8 deletions mParticle-Apple-SDK.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
534CD26929CE2CE1008452B3 /* MPSurrogateAppDelegateTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79C8529CE019F00E7489F /* MPSurrogateAppDelegateTests.m */; };
534CD26A29CE2CE1008452B3 /* MPGDPRConsentTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79CA129CE019F00E7489F /* MPGDPRConsentTests.m */; };
534CD26B29CE2CE1008452B3 /* MPBackendControllerTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79C8629CE019F00E7489F /* MPBackendControllerTests.m */; };
534CD26C29CE2CE1008452B3 /* MPKitConfigurationTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53A79CB029CE019F00E7489F /* MPKitConfigurationTests.mm */; };
534CD26C29CE2CE1008452B3 /* MPKitConfigurationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79CB029CE019F00E7489F /* MPKitConfigurationTests.m */; };
534CD26E29CE2CE1008452B3 /* MPNetworkCommunicationTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79C6F29CE019E00E7489F /* MPNetworkCommunicationTests.m */; };
534CD26F29CE2CE1008452B3 /* MPAliasRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79CB129CE019F00E7489F /* MPAliasRequestTests.m */; };
534CD27029CE2CE1008452B3 /* MPAliasResponseTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79CAE29CE019F00E7489F /* MPAliasResponseTests.m */; };
Expand Down Expand Up @@ -197,7 +197,7 @@
53A79D7429CE23F700E7489F /* MPBaseEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B4829CDFB1F00E7489F /* MPBaseEvent.m */; };
53A79D7529CE23F700E7489F /* MPAttributeProjection.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B5A29CDFB1F00E7489F /* MPAttributeProjection.m */; };
53A79D7629CE23F700E7489F /* MPConsumerInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AC429CDFB1E00E7489F /* MPConsumerInfo.m */; };
53A79D7729CE23F700E7489F /* MPKitConfiguration.mm in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B4F29CDFB1F00E7489F /* MPKitConfiguration.mm */; };
53A79D7729CE23F700E7489F /* MPKitConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B4F29CDFB1F00E7489F /* MPKitConfiguration.m */; };
53A79D7829CE23F700E7489F /* MPConsentState.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AF929CDFB1F00E7489F /* MPConsentState.m */; };
53A79D7929CE23F700E7489F /* MPBracket.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79B1E29CDFB1F00E7489F /* MPBracket.m */; };
53A79D7A29CE23F700E7489F /* MParticleUserNotification.m in Sources */ = {isa = PBXBuildFile; fileRef = 53A79AC729CDFB1E00E7489F /* MParticleUserNotification.m */; };
Expand Down Expand Up @@ -451,7 +451,7 @@
53A79B4C29CDFB1F00E7489F /* MPKitRegister.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPKitRegister.m; sourceTree = "<group>"; };
53A79B4D29CDFB1F00E7489F /* MPKitExecStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPKitExecStatus.m; sourceTree = "<group>"; };
53A79B4E29CDFB1F00E7489F /* MPAttributeProjection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAttributeProjection.h; sourceTree = "<group>"; };
53A79B4F29CDFB1F00E7489F /* MPKitConfiguration.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MPKitConfiguration.mm; sourceTree = "<group>"; };
53A79B4F29CDFB1F00E7489F /* MPKitConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPKitConfiguration.m; sourceTree = "<group>"; };
53A79B5029CDFB1F00E7489F /* MPKitContainer.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MPKitContainer.mm; sourceTree = "<group>"; };
53A79B5129CDFB1F00E7489F /* MPForwardQueueParameters.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPForwardQueueParameters.m; sourceTree = "<group>"; };
53A79B5229CDFB1F00E7489F /* MPForwardQueueItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPForwardQueueItem.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -563,7 +563,7 @@
53A79CAD29CE019F00E7489F /* BracketTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BracketTests.m; sourceTree = "<group>"; };
53A79CAE29CE019F00E7489F /* MPAliasResponseTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAliasResponseTests.m; sourceTree = "<group>"; };
53A79CAF29CE019F00E7489F /* MPForwardRecordTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPForwardRecordTests.m; sourceTree = "<group>"; };
53A79CB029CE019F00E7489F /* MPKitConfigurationTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MPKitConfigurationTests.mm; sourceTree = "<group>"; };
53A79CB029CE019F00E7489F /* MPKitConfigurationTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPKitConfigurationTests.m; sourceTree = "<group>"; };
53A79CB129CE019F00E7489F /* MPAliasRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAliasRequestTests.m; sourceTree = "<group>"; };
53A79CB429CE019F00E7489F /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
53A79CB529CE019F00E7489F /* MPAppNotificationHandlerTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAppNotificationHandlerTests.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -947,7 +947,7 @@
53A79B4C29CDFB1F00E7489F /* MPKitRegister.m */,
53A79B4D29CDFB1F00E7489F /* MPKitExecStatus.m */,
53A79B4E29CDFB1F00E7489F /* MPAttributeProjection.h */,
53A79B4F29CDFB1F00E7489F /* MPKitConfiguration.mm */,
53A79B4F29CDFB1F00E7489F /* MPKitConfiguration.m */,
53A79B5029CDFB1F00E7489F /* MPKitContainer.mm */,
53A79B5129CDFB1F00E7489F /* MPForwardQueueParameters.m */,
53A79B5229CDFB1F00E7489F /* MPForwardQueueItem.h */,
Expand Down Expand Up @@ -1117,7 +1117,7 @@
53A79CAD29CE019F00E7489F /* BracketTests.m */,
53A79CAE29CE019F00E7489F /* MPAliasResponseTests.m */,
53A79CAF29CE019F00E7489F /* MPForwardRecordTests.m */,
53A79CB029CE019F00E7489F /* MPKitConfigurationTests.mm */,
53A79CB029CE019F00E7489F /* MPKitConfigurationTests.m */,
53A79CB129CE019F00E7489F /* MPAliasRequestTests.m */,
53A79CB529CE019F00E7489F /* MPAppNotificationHandlerTests.m */,
53A79CB629CE019F00E7489F /* MPKitRegisterTests.m */,
Expand Down Expand Up @@ -1375,7 +1375,7 @@
356D4A5A2E58B09D00CB69FE /* SettingsProviderMock.swift in Sources */,
7E573D2A2ECB65D90087185D /* MParticleSceneDelegateTests.swift in Sources */,
534CD26B29CE2CE1008452B3 /* MPBackendControllerTests.m in Sources */,
534CD26C29CE2CE1008452B3 /* MPKitConfigurationTests.mm in Sources */,
534CD26C29CE2CE1008452B3 /* MPKitConfigurationTests.m in Sources */,
7231B80E2EB3C4AC001565E5 /* MPKitMock.swift in Sources */,
534CD26E29CE2CE1008452B3 /* MPNetworkCommunicationTests.m in Sources */,
534CD26F29CE2CE1008452B3 /* MPAliasRequestTests.m in Sources */,
Expand Down Expand Up @@ -1491,7 +1491,7 @@
53A79D7529CE23F700E7489F /* MPAttributeProjection.m in Sources */,
D3961CD72CB468DC003B3194 /* NSArray+MPCaseInsensitive.swift in Sources */,
53A79D7629CE23F700E7489F /* MPConsumerInfo.m in Sources */,
53A79D7729CE23F700E7489F /* MPKitConfiguration.mm in Sources */,
53A79D7729CE23F700E7489F /* MPKitConfiguration.m in Sources */,
53A79D7829CE23F700E7489F /* MPConsentState.m in Sources */,
D3CEDACC2CB027E1001B32DF /* MPConvertJS.swift in Sources */,
53A79D7929CE23F700E7489F /* MPBracket.m in Sources */,
Expand Down
28 changes: 12 additions & 16 deletions ...icle-Apple-SDK/Kits/MPKitConfiguration.mm → ...ticle-Apple-SDK/Kits/MPKitConfiguration.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
#import "mParticle.h"
#import "MPEnums.h"
#import "MParticleSwift.h"
#import <vector>

@interface MPKitConfiguration()
@property (nonatomic, strong) NSDictionary *configurationDictionary;
Expand Down Expand Up @@ -191,36 +190,33 @@ - (void)configureProjections:(NSArray *)projections {
return;
}

auto numberOfMessageTypes = [MPEnum messageTypeSize];
std::vector<NSNumber *> configuredMessageTypeProjectionsVector;
configuredMessageTypeProjectionsVector.reserve(numberOfMessageTypes);
std::vector<MPEventProjection *> defaultProjectionsVector;
defaultProjectionsVector.reserve(numberOfMessageTypes);
std::vector<MPEventProjection *> projectionsVector;
projectionsVector.reserve(projections.count - 1);
NSUInteger numberOfMessageTypes = [MPEnum messageTypeSize];
NSMutableArray<NSNumber *> *configuredMessageTypeProjectionsArray = [[NSMutableArray alloc] initWithCapacity:numberOfMessageTypes];
NSMutableArray *defaultProjectionsArray = [[NSMutableArray alloc] initWithCapacity:numberOfMessageTypes];
NSMutableArray<MPEventProjection *> *projectionsArray = [[NSMutableArray alloc] initWithCapacity:projections.count];

for (NSUInteger i = 0; i < numberOfMessageTypes; ++i) {
configuredMessageTypeProjectionsVector.push_back(@NO);
defaultProjectionsVector.push_back((MPEventProjection *)[NSNull null]);
[configuredMessageTypeProjectionsArray addObject:@NO];
[defaultProjectionsArray addObject:[NSNull null]];
}

for (NSDictionary *projectionDictionary in projections) {
MPEventProjection *eventProjection = [[MPEventProjection alloc] initWithConfiguration:projectionDictionary];

if (eventProjection) {
configuredMessageTypeProjectionsVector[eventProjection.messageType] = @YES;
configuredMessageTypeProjectionsArray[eventProjection.messageType] = @YES;

if (eventProjection.isDefault) {
defaultProjectionsVector[eventProjection.messageType] = eventProjection;
defaultProjectionsArray[eventProjection.messageType] = eventProjection;
} else {
projectionsVector.push_back(eventProjection);
[projectionsArray addObject:eventProjection];
}
}
}

_configuredMessageTypeProjections = [NSArray arrayWithObjects:&configuredMessageTypeProjectionsVector[0] count:configuredMessageTypeProjectionsVector.size()];
_defaultProjections = [NSArray arrayWithObjects:&defaultProjectionsVector[0] count:defaultProjectionsVector.size()];
_projections = !projectionsVector.empty() ? [NSArray arrayWithObjects:&projectionsVector[0] count:projectionsVector.size()] : nil;
_configuredMessageTypeProjections = [configuredMessageTypeProjectionsArray copy];
_defaultProjections = [defaultProjectionsArray copy];
_projections = projectionsArray.count > 0 ? [projectionsArray copy] : nil;
}

@end
Loading