Skip to content

feat: Migrate mp upload settings convert to objc updated #542

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

Draft
denischilik wants to merge 5 commits into
base: workstation/9.0-Release
Choose a base branch
from
Draft

feat: Migrate mp upload settings convert to objc updated #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f5d7645
feat: Convert type to objc
denischilik Feb 2, 2026
b2a2f63
Fix import
denischilik Feb 2, 2026
ebd8c66
Create connector class
denischilik Feb 2, 2026
fa71306
Move dependencies inside MPUserDefaultsConnector. This allows removin…
denischilik Feb 2, 2026
895169a
Merge branch 'workstation/9.0-Release' into Migrate_MPUploadSettings_…
denischilik Feb 2, 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
11 changes: 6 additions & 5 deletions UnitTests/ObjCTests/MPBackendControllerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
#import "MPKitConfiguration.h"
#import "MParticleSwift.h"
#import "MPBaseTestCase.h"
#import "MPUserDefaultsConnector.h"

#if TARGET_OS_IOS == 1
#import <CoreLocation/CoreLocation.h>
Expand Down Expand Up @@ -550,7 +551,7 @@ - (void)testBatchCycle {
}

- (void)testUploadWithDifferentUser {
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;

//Set up Identity to exist
[userDefaults setMPObject:[NSDate date] forKey:kMPLastIdentifiedDate userId:@1];
Expand Down Expand Up @@ -1298,7 +1299,7 @@ - (void)testSetUserAttributeKits {
kMPRemoteConfigSessionTimeoutKey:@112};

NSTimeInterval requestTimestamp = [[NSDate date] timeIntervalSince1970];
[[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];
[MPUserDefaultsConnector.userDefaults setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];
}

[self.backendController setUserAttribute:@"foo attribute 3" value:@"foo value 3" timestamp:[NSDate date] completionHandler:^(NSString * _Nonnull key, id _Nullable value, MPExecStatus execStatus) {}];
Expand Down Expand Up @@ -2173,7 +2174,7 @@ - (void)testUserIdentitiesForUserIdNoInvalidIdTypes {
NSArray *userIdentities = @[validUserId];

MParticleUser *currentUser = [[[MParticle sharedInstance] identity] currentUser];
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
[userDefaults setMPObject:userIdentities forKey:kMPUserIdentityArrayKey userId:currentUser.userId];

NSArray *currentUserIdentities = [[[MParticle sharedInstance] backendController] userIdentitiesForUserId:currentUser.userId];
Expand All @@ -2197,7 +2198,7 @@ - (void)testUserIdentitiesForUserIdOneInvalidIdType {
NSArray *userIdentities = @[validUserId, invalidUserId];

MParticleUser *currentUser = [[[MParticle sharedInstance] identity] currentUser];
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
[userDefaults setMPObject:userIdentities forKey:kMPUserIdentityArrayKey userId:currentUser.userId];

NSArray *currentUserIdentities = [[[MParticle sharedInstance] backendController] userIdentitiesForUserId:currentUser.userId];
Expand Down Expand Up @@ -2226,7 +2227,7 @@ - (void)testUserIdentitiesForUserIdMultipleInvalidIdTypes {
NSArray *userIdentities = @[validUserId, invalidUserId, invalidUserId2];

MParticleUser *currentUser = [[[MParticle sharedInstance] identity] currentUser];
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
[userDefaults setMPObject:userIdentities forKey:kMPUserIdentityArrayKey userId:currentUser.userId];

NSArray *currentUserIdentities = [[[MParticle sharedInstance] backendController] userIdentitiesForUserId:currentUser.userId];
Expand Down
5 changes: 3 additions & 2 deletions UnitTests/ObjCTests/MPKitAPITests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#import "MPKitContainer.h"
#import "MPKitConfiguration.h"
#import "MPIConstants.h"
#import "MPUserDefaultsConnector.h"
@import mParticle_Apple_SDK_Swift;

@interface MPKitContainer_PRIVATE ()
Expand Down Expand Up @@ -116,7 +117,7 @@ - (void)testUserIdentities {
@"f":@NO
}
];
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
[userDefaults setMPObject:userIdentities forKey:kMPUserIdentityArrayKey userId:currentUser.userId];
[userDefaults removeMPObjectForKey:@"ua"];

Expand Down Expand Up @@ -159,7 +160,7 @@ - (void)testUserAttributeFromCache {
@"better data":@"ABC",
@"bad data":@"12345"
};
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
[userDefaults setMPObject:userAttributes forKey:kMPUserAttributeKey userId:currentUser.userId];
MParticle* mparticle = MParticle.sharedInstance;
MPLog* logger = [[MPLog alloc] initWithLogLevel:[MPLog fromRawValue:mparticle.logLevel]];
Expand Down
21 changes: 11 additions & 10 deletions UnitTests/ObjCTests/MPKitContainerTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#import "MParticleSwift.h"
#import "MPCCPAConsent.h"
#import "MPGDPRConsent.h"
#import "MPUserDefaultsConnector.h"

@interface MParticle ()

Expand Down Expand Up @@ -136,7 +137,7 @@ - (void)tearDown {
}

- (void)setUserAttributesAndIdentities {
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
NSDictionary *userAttributes = @{@"Dinosaur":@"T-Rex",
@"Arm length":@"Short",
@"Height":@20,
Expand Down Expand Up @@ -193,11 +194,11 @@ - (void)testUpdateKitConfiguration {
MPResponseConfig *responseConfig = [[MPResponseConfig alloc] initWithConfiguration:configuration stateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController];

NSTimeInterval requestTimestamp = [[NSDate date] timeIntervalSince1970];
[[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];
[MPUserDefaultsConnector.userDefaults setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];

XCTAssertEqualObjects(responseConfig.configuration, [MPUserDefaults restore].configuration);

NSArray *directoryContents = [[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] getKitConfigurations];
NSArray *directoryContents = [MPUserDefaultsConnector.userDefaults getKitConfigurations];
for (NSDictionary *kitConfigurationDictionary in directoryContents) {
MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:kitConfigurationDictionary];
if ([[kitConfiguration integrationId] isEqual:@(42)]){
Expand All @@ -214,7 +215,7 @@ - (void)testUpdateKitConfiguration {
- (void)testRemoveKitConfiguration {
static NSString *const kTestAppId1 = @"cool app key";
static NSString *const kTestAppId2 = @"cool app key 2";
[[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] resetDefaults];
[MPUserDefaultsConnector.userDefaults resetDefaults];
[self setUserAttributesAndIdentities];

NSDictionary *configuration1 = @{
Expand Down Expand Up @@ -247,7 +248,7 @@ - (void)testRemoveKitConfiguration {
MPResponseConfig *responseConfig = [[MPResponseConfig alloc] initWithConfiguration:configuration stateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController];

NSTimeInterval requestTimestamp = [[NSDate date] timeIntervalSince1970];
[[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];
[MPUserDefaultsConnector.userDefaults setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];

XCTAssertEqualObjects(responseConfig.configuration, [MPUserDefaults restore].configuration);

Expand All @@ -258,7 +259,7 @@ - (void)testRemoveKitConfiguration {
}
XCTAssertEqualObjects(kTestAppId1, appId);

NSArray *directoryContents = [[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] getKitConfigurations];
NSArray *directoryContents = [MPUserDefaultsConnector.userDefaults getKitConfigurations];
for (NSDictionary *kitConfigurationDictionary in directoryContents) {
MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:kitConfigurationDictionary];
if ([[kitConfiguration integrationId] isEqual:@(42)]){
Expand Down Expand Up @@ -290,7 +291,7 @@ - (void)testRemoveKitConfiguration {
responseConfig = [[MPResponseConfig alloc] initWithConfiguration:configuration stateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController];

requestTimestamp = [[NSDate date] timeIntervalSince1970];
[[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];
[MPUserDefaultsConnector.userDefaults setConfiguration:configuration eTag:eTag requestTimestamp:requestTimestamp currentAge:0 maxAge:nil];

XCTAssertEqualObjects(responseConfig.configuration, [MPUserDefaults restore].configuration);

Expand All @@ -300,7 +301,7 @@ - (void)testRemoveKitConfiguration {
}
XCTAssertEqualObjects(kTestAppId1, appId2);

directoryContents = [[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] getKitConfigurations];
directoryContents = [MPUserDefaultsConnector.userDefaults getKitConfigurations];
for (NSDictionary *kitConfigurationDictionary in directoryContents) {
MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:kitConfigurationDictionary];
if ([[kitConfiguration integrationId] isEqual:@(42)]){
Expand All @@ -321,7 +322,7 @@ - (void)testRemoveKitConfiguration {
}

- (void)testIsDisabledByBracketConfiguration {
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
userDefaults[@"mpid"] = @2;

NSDictionary *bracketConfig = @{@"hi":@(0),@"lo":@(0)};
Expand Down Expand Up @@ -2867,7 +2868,7 @@ - (void)testForwardEventToSideloadedKit {
}

- (void)testAppInfoContainsSideloadKitsFlag {
[[MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity] setSideloadedKitsCount:3];
[MPUserDefaultsConnector.userDefaults setSideloadedKitsCount:3];

NSDictionary *dict = [[[MPApplication_PRIVATE alloc] init] dictionaryRepresentation];

Expand Down
11 changes: 6 additions & 5 deletions UnitTests/ObjCTests/MPNetworkCommunicationTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#import "MPStateMachine.h"
#import "MParticleSwift.h"
#import "MPIConstants.h"
#import "MPUserDefaultsConnector.h"

@import mParticle_Apple_SDK_Swift;

Expand Down Expand Up @@ -596,7 +597,7 @@ - (void)testUploadInvalidDeletion {
}

- (void)testRequestConfigWithDefaultMaxAge {
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
NSNumber *configProvisioned = userDefaults[kMPConfigProvisionedTimestampKey];
NSNumber *maxAge = userDefaults[kMPConfigMaxAgeHeaderKey];

Expand Down Expand Up @@ -656,7 +657,7 @@ - (void)testRequestConfigWithDefaultMaxAge {
}

- (void)testRequestConfigWithManualMaxAge {
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
userDefaults[kMPConfigProvisionedTimestampKey] = @5555;

MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
Expand Down Expand Up @@ -760,7 +761,7 @@ - (void)testRequestConfigWithManualMaxAgeAndInitialAge {
XCTAssert(success);
}];

MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
[userDefaults synchronize];

NSNumber *provisionedInterval = userDefaults[kMPConfigProvisionedTimestampKey];
Expand All @@ -771,7 +772,7 @@ - (void)testRequestConfigWithManualMaxAgeAndInitialAge {
}

- (void)testRequestConfigWithManualMaxAgeOverMaxAllowed {
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
userDefaults[kMPConfigProvisionedTimestampKey] = @5555;

MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
Expand Down Expand Up @@ -828,7 +829,7 @@ - (void)testRequestConfigWithManualMaxAgeOverMaxAllowed {
}

- (void)testRequestConfigWithComplexCacheControlHeader {
MPUserDefaults *userDefaults = [MPUserDefaults standardUserDefaultsWithStateMachine:[MParticle sharedInstance].stateMachine backendController:[MParticle sharedInstance].backendController identity:[MParticle sharedInstance].identity];
MPUserDefaults *userDefaults = MPUserDefaultsConnector.userDefaults;
userDefaults[kMPConfigProvisionedTimestampKey] = @5555;

MPNetworkCommunication_PRIVATE *networkCommunication = [[MPNetworkCommunication_PRIVATE alloc] init];
Expand Down
Loading
Loading