Merge pull request #687 from mParticle/chore/merge-main-into-workstation-9.0-2026-03-25

chore: Merge from Main 3-25-26

Author: BrandonStalnaker

CHANGELOG.md

@@ -16,6 +16,27 @@ All notable changes to the mParticle Apple SDK (core and integration kits) are d
 
 ---
 
+# [8.44.3](https://github.com/mParticle/mparticle-apple-sdk/compare/v8.44.2...v8.44.3) (2026-03-23)
+
+### Bug Fixes
+
+- fix: serialize updateLastUseDate with messageQueue on background entry (#680) ([ba76afc5](https://github.com/mParticle/mparticle-apple-sdk/commit/ba76afc5c619e3fcf06acbb976e2e9e072845a7e))
+
+# [8.44.2](https://github.com/mParticle/mparticle-apple-sdk/compare/v8.44.1...v8.44.2) (2026-03-17)
+
+### Bug Fixes
+
+- fix: serialize backgroundTimeRemaining with cancellation check (#667) ([beccd65a](https://github.com/mParticle/mparticle-apple-sdk/commit/beccd65a2d3ba77a548ca1d104a14d511174e528))
+
+# [8.44.1](https://github.com/mParticle/mparticle-apple-sdk/compare/v8.44.0...v8.44.1) (2026-03-11)
+
+### Bug Fixes
+
+- fix: Add Defensive Code when Building URL Signatures (#656) ([d84ef13e](https://github.com/mParticle/mparticle-apple-sdk/commit/d84ef13ed1547c8e28196727ea2f183941debf1b))
+- fix: WKWebView Logging Crash (#662) ([edaa25c0](https://github.com/mParticle/mparticle-apple-sdk/commit/edaa25c0b3b230207c5344d06c5879f51a756b6e))
+- fix: Crash in MPSession description (#661) ([dd6c80f9](https://github.com/mParticle/mparticle-apple-sdk/commit/dd6c80f9942c2ea7863b945a1a47844444e89f4a))
+- fix: Remove Outdated previousSessionSuccessfullyClosed Logic (#655) ([84ad0875](https://github.com/mParticle/mparticle-apple-sdk/commit/84ad08757b5c845dfefe9b9e1bef2655b5e8c9ed))
+
 # [8.44.0](https://github.com/mParticle/mparticle-apple-sdk/compare/v8.43.1...v8.44.0) (2026-02-19)
 
 ### Bug Fixes

Framework/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>8.44.0</string>
+	<string>8.44.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

Kits/braze/braze-14/Tests/mParticle-BrazeTests/mParticle_BrazeTests.m

@@ -18,8 +18,8 @@ - (void)setBrazeInstanceLocal:(Braze *)instance;
 - (void)setEnableTypeDetection:(BOOL)enableTypeDetection;
 + (BOOL)shouldDisableNotificationHandling;
 + (Braze *)brazeInstance;
-+ (MPKitExecStatus *)updateUser:(FilteredMParticleUser *)user request:(NSDictionary<NSNumber *,NSString *> *)userIdentities;
-+ (MPKitExecStatus *)setUserAttribute:(NSString *)key value:(NSString *)value;
+- (MPKitExecStatus *)updateUser:(FilteredMParticleUser *)user request:(NSDictionary<NSNumber *,NSString *> *)userIdentities;
+- (MPKitExecStatus *)setUserAttribute:(NSString *)key value:(NSString *)value;
 
 @end
 
@@ -34,10 +34,19 @@ - (void)setUp {
     // Put setup code here. This method is called before the invocation of each test method in the class.
     [MPKitBraze setBrazeInstance:nil];
     [MPKitBraze setURLDelegate:nil];
+#if TARGET_OS_IOS
+    [MPKitBraze setInAppMessageControllerDelegate:nil];
+    [MPKitBraze setShouldDisableNotificationHandling:NO];
+#endif
 }
 
 - (void)tearDown {
-    // Put teardown code here. This method is called after the invocation of each test method in the class.
+    [MPKitBraze setBrazeInstance:nil];
+    [MPKitBraze setURLDelegate:nil];
+#if TARGET_OS_IOS
+    [MPKitBraze setInAppMessageControllerDelegate:nil];
+    [MPKitBraze setShouldDisableNotificationHandling:NO];
+#endif
     [super tearDown];
 }
 
@@ -75,10 +84,10 @@ - (void)testStartwithAdvancedConfig {
 
     NSDictionary *testOptionsDictionary = @{ABKEnableAutomaticLocationCollectionKey:@(YES),
                                             ABKSDKFlavorKey:@7,
-                                            @"ABKRquestProcessingPolicy": @(1),
-                                            @"ABKFlushInterval":@(2),
-                                            @"ABKSessionTimeout":@(3),
-                                            @"ABKMinimumTriggerTimeInterval":@(4)
+                                            ABKRequestProcessingPolicyOptionKey: @(1),
+                                            ABKFlushIntervalOptionKey: @(2),
+                                            ABKSessionTimeoutKey: @(3),
+                                            ABKMinimumTriggerTimeIntervalKey: @(4)
                                             };
 
     NSDictionary *optionsDictionary = [braze optionsDictionary];
@@ -254,15 +263,15 @@ - (void)testSubscriptionGroupIdsMappedUserAttributes {
     id mockClient = OCMPartialMock(testClient);
     [kitInstance setBrazeInstanceLocal:mockClient];
     XCTAssertEqualObjects(mockClient, [kitInstance brazeInstanceLocal]);
-    
-    // Should succeed since Bool false is a valid value
+    // subscriptionGroupMapping is applied in -start only; without -start mapped keys are handled as custom attributes (invalid subscription values would incorrectly return success).
+    [kitInstance start];
+
     MPKitExecStatus *execStatus1 = [kitInstance setUserAttribute:@"testAttribute1" value:@NO];
-    XCTAssertEqual(execStatus1.returnCode, MPKitReturnCodeSuccess);
-    // Should succeed since Bool true is a valid value
     MPKitExecStatus *execStatus2 = [kitInstance setUserAttribute:@"testAttribute2" value:@YES];
-    XCTAssertEqual(execStatus2.returnCode, MPKitReturnCodeSuccess);
-    // Should fail since testValue is not type BOOL
     MPKitExecStatus *execStatus3 = [kitInstance setUserAttribute:@"testAttribute2" value:@"testValue"];
+
+    XCTAssertEqual(execStatus1.returnCode, MPKitReturnCodeSuccess);
+    XCTAssertEqual(execStatus2.returnCode, MPKitReturnCodeSuccess);
     XCTAssertEqual(execStatus3.returnCode, MPKitReturnCodeFail);
 
     [mockClient verify];

Kits/rokt/rokt/Sources/mParticle-Rokt-Swift/MPRoktLayout.swift

@@ -58,6 +58,7 @@ public class MPRoktLayout {
                         "locationName:\(locationName), " +
                         "attributes:\(preparedAttributes)"
                 )
+
             self.roktLayout = RoktLayout.init(
                 sdkTriggered: sdkTriggered,
                 identifier: identifier,

UnitTests/Mocks/SceneDelegateHandlerMock.swift

@@ -6,7 +6,6 @@ class OpenURLHandlerProtocolMock: NSObject, OpenURLHandlerProtocol {
     var openURLWithOptionsURLParam: URL?
     var openURLWithOptionsOptionsParam: [String: Any]?
 
-    @objc(openURL:options:)
     func open(_ url: URL, options: [String: Any]?) {
         openURLWithOptionsCalled = true
         openURLWithOptionsURLParam = url
@@ -18,11 +17,8 @@ class OpenURLHandlerProtocolMock: NSObject, OpenURLHandlerProtocol {
     var continueUserActivityRestorationHandlerParam: (([UIUserActivityRestoring]?) -> Void)?
     var continueUserActivityReturnValue: Bool = false
 
-    @objc(continueUserActivity:restorationHandler:)
-    func `continue`(
-        _ userActivity: NSUserActivity,
-        restorationHandler: @escaping ([any UIUserActivityRestoring]?) -> Void
-    ) -> Bool {
+    func `continue`(_ userActivity: NSUserActivity,
+                    restorationHandler: @escaping ([UIUserActivityRestoring]?) -> Void) -> Bool {
         continueUserActivityCalled = true
         continueUserActivityUserActivityParam = userActivity
         continueUserActivityRestorationHandlerParam = restorationHandler

UnitTests/ObjCTests/MPBackendControllerTests.m

@@ -2442,6 +2442,107 @@ - (void)testBackgroundTimeCheckLoopStoresTimeRemainingInLocalVariable {
     [MPApplication_PRIVATE setMockApplication:nil];
 }
 
+- (void)testForegroundHandlerStopsBackgroundTimeRemainingCalls {
+    // Verify that when the app returns to foreground (simulated via
+    // cancelBackgroundTimeCheckLoop + endBackgroundTask, the same
+    // sequence as handleApplicationWillEnterForeground), the loop
+    // stops calling backgroundTimeRemaining. This is the scenario
+    // where the TOCTOU race was observed (2ms window in production).
+    
+    __block NSInteger backgroundTimeRemainingCallCount = 0;
+    
+    id mockApplication = OCMClassMock([UIApplication class]);
+    OCMStub([mockApplication applicationState]).andReturn(UIApplicationStateBackground);
+    OCMStub([mockApplication backgroundTimeRemaining]).andDo(^(NSInvocation *invocation) {
+        backgroundTimeRemainingCallCount++;
+        NSTimeInterval remaining = 25.0;
+        [invocation setReturnValue:&remaining];
+    });
+    OCMStub([mockApplication beginBackgroundTaskWithExpirationHandler:OCMOCK_ANY]).andReturn((UIBackgroundTaskIdentifier)42);
+    OCMStub([mockApplication endBackgroundTask:(UIBackgroundTaskIdentifier)42]);
+    
+    [MPApplication_PRIVATE setMockApplication:mockApplication];
+    
+    // Start the background task
+    XCTestExpectation *taskStarted = [self expectationWithDescription:@"Background task started"];
+    [self.backendController beginBackgroundTask];
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [taskStarted fulfill];
+    });
+    [self waitForExpectations:@[taskStarted] timeout:2.0];
+    
+    // Start the background time check loop
+    dispatch_async(messageQueue, ^{
+        [self.backendController beginBackgroundTimeCheckLoop];
+    });
+    
+    // Let the loop run a few iterations
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:3.0]];
+    NSInteger callsBeforeForeground = backgroundTimeRemainingCallCount;
+    XCTAssertGreaterThan(callsBeforeForeground, 0, @"Loop should have called backgroundTimeRemaining at least once");
+    
+    // Simulate the foreground handler (same sequence as handleApplicationWillEnterForeground)
+    [self.backendController cancelBackgroundTimeCheckLoop];
+    [self.backendController endBackgroundTask];
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.5]];
+    
+    // Record calls and wait to confirm no new calls arrive
+    NSInteger callsAtForeground = backgroundTimeRemainingCallCount;
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:3.0]];
+    NSInteger callsAfterForeground = backgroundTimeRemainingCallCount;
+    
+    XCTAssertEqual(callsAfterForeground, callsAtForeground,
+                   @"backgroundTimeRemaining should not be called after foreground handler. "
+                   "Calls at foreground: %ld, calls after waiting: %ld",
+                   (long)callsAtForeground, (long)callsAfterForeground);
+    
+    XCTAssertEqual(self.backendController.backgroundCheckQueue.operationCount, 0,
+                   @"Background check queue should have no running operations after foreground");
+    
+    [self.backendController cancelBackgroundTimeCheckLoop];
+    [MPApplication_PRIVATE setMockApplication:nil];
+}
+
+- (void)testBackgroundTimeRemainingIsAccessedOnMainThread {
+    __block BOOL allAccessesOnMainThread = YES;
+
+    id mockApplication = OCMClassMock([UIApplication class]);
+
+    __block NSInteger stateCallCount = 0;
+    OCMStub([mockApplication applicationState]).andDo(^(NSInvocation *invocation) {
+        UIApplicationState state = (stateCallCount < 3)
+            ? UIApplicationStateBackground
+            : UIApplicationStateActive;
+        stateCallCount++;
+        [invocation setReturnValue:&state];
+    });
+
+    OCMStub([mockApplication backgroundTimeRemaining]).andDo(^(NSInvocation *invocation) {
+        if (![NSThread isMainThread]) {
+            allAccessesOnMainThread = NO;
+        }
+        NSTimeInterval remaining = 25.0;
+        [invocation setReturnValue:&remaining];
+    });
+    OCMStub([mockApplication beginBackgroundTaskWithExpirationHandler:OCMOCK_ANY]).andReturn((UIBackgroundTaskIdentifier)42);
+    OCMStub([mockApplication endBackgroundTask:(UIBackgroundTaskIdentifier)42]);
+
+    [MPApplication_PRIVATE setMockApplication:mockApplication];
+
+    dispatch_async(messageQueue, ^{
+        [self.backendController beginBackgroundTimeCheckLoop];
+    });
+
+    [[NSRunLoop mainRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:5.0]];
+
+    XCTAssertTrue(allAccessesOnMainThread,
+                  @"backgroundTimeRemaining must be accessed on the main thread "
+                  "to prevent XPC race conditions during app suspension");
+
+    [self.backendController cancelBackgroundTimeCheckLoop];
+    [MPApplication_PRIVATE setMockApplication:nil];
+}
+
 - (void)testEndSessionIfTimedOutDispatchesToMessageQueue {
     // Verify that endSessionIfTimedOut called from a non-message-queue thread
     // does not mutate session properties directly on that thread, but instead

UnitTests/ObjCTests/MPRoktTests.m

@@ -196,7 +196,7 @@ - (void)testSelectPlacementsExpandedWithValidParameters {
 
     // Wait for async operation
     [self waitForExpectationsWithTimeout:0.2 handler:nil];
-    
+
     // Verify
     OCMVerifyAll(self.mockContainer);
 }

UnitTests/ObjCTests/MPStateMachineTests.m

@@ -22,6 +22,9 @@ @interface MParticle ()
 
 @property (nonatomic, strong) MPStateMachine_PRIVATE *stateMachine;
 @property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
+@property (nonatomic, strong, nonnull) MPBackendController_PRIVATE *backendController;
+
++ (dispatch_queue_t)messageQueue;
 
 @end
 
@@ -271,4 +274,97 @@ - (void)testApiKeySecretThreadSafety {
     [self waitForExpectationsWithTimeout:30 handler:nil];
 }
 
+#pragma mark - Background UserDefaults Serialization Tests
+
+- (void)testUpdateLastUseDateSerializedWithMessageQueueWork {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Serialized background access"];
+
+    [MParticle sharedInstance].backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)[MParticle sharedInstance]];
+    [MPPersistenceController_PRIVATE setMpid:@12345];
+
+    MPUserDefaults *defaults = MPUserDefaultsConnector.userDefaults;
+
+    dispatch_queue_t sdkMessageQueue = [MParticle messageQueue];
+    dispatch_group_t group = dispatch_group_create();
+    NSInteger iterations = 500;
+
+    for (NSInteger i = 0; i < iterations; i++) {
+        dispatch_group_async(group, sdkMessageQueue, ^{
+            [MPApplication_PRIVATE updateLastUseDate:[NSDate date]];
+        });
+
+        dispatch_group_async(group, sdkMessageQueue, ^{
+            [defaults setMPObject:@(i) forKey:@"testBg" userId:[MPPersistenceController_PRIVATE mpId]];
+        });
+
+        dispatch_group_async(group, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+            NSNumber *mpId = [MPPersistenceController_PRIVATE mpId];
+            (void)mpId;
+        });
+    }
+
+    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+        MPUserDefaults *ud = MPUserDefaultsConnector.userDefaults;
+        NSNumber *lastUseDate = ud[kMPAppLastUseDateKey];
+        XCTAssertNotNil(lastUseDate, @"lastUseDate must be persisted after background transition");
+        [expectation fulfill];
+    });
+
+    [self waitForExpectationsWithTimeout:30 handler:nil];
+}
+
+- (void)testSubscriptAccessorThreadSafety {
+    XCTestExpectation *expectation = [self expectationWithDescription:@"Subscript thread safety"];
+
+    [MParticle sharedInstance].backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)[MParticle sharedInstance]];
+    [MPPersistenceController_PRIVATE setMpid:@42];
+
+    MPUserDefaults *defaults = MPUserDefaultsConnector.userDefaults;
+
+    dispatch_group_t group = dispatch_group_create();
+    dispatch_queue_t concurrentQueue = dispatch_queue_create("com.mparticle.test.subscript.concurrent", DISPATCH_QUEUE_CONCURRENT);
+    NSInteger iterations = 1000;
+
+    for (NSInteger i = 0; i < iterations; i++) {
+        dispatch_group_async(group, concurrentQueue, ^{
+            id value = defaults[@"lud"];
+            (void)value;
+        });
+
+        dispatch_group_async(group, concurrentQueue, ^{
+            defaults[@"lud"] = @(1234567890 + i);
+        });
+
+        dispatch_group_async(group, concurrentQueue, ^{
+            id mpidValue = defaults[@"mpid"];
+            (void)mpidValue;
+        });
+
+        dispatch_group_async(group, concurrentQueue, ^{
+            defaults[@"mpid"] = @(i % 100);
+        });
+    }
+
+    dispatch_group_notify(group, dispatch_get_main_queue(), ^{
+        [expectation fulfill];
+    });
+
+    [self waitForExpectationsWithTimeout:30 handler:nil];
+}
+
+- (void)testUpdateLastUseDateWithNilDate {
+    [MParticle sharedInstance].backendController = [[MPBackendController_PRIVATE alloc] initWithDelegate:(id<MPBackendControllerDelegate>)[MParticle sharedInstance]];
+    [MPPersistenceController_PRIVATE setMpid:@1];
+
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wnonnull"
+    [MPApplication_PRIVATE updateLastUseDate:nil];
+#pragma clang diagnostic pop
+
+    MPUserDefaults *defaults = MPUserDefaultsConnector.userDefaults;
+    NSNumber *lastUseDate = defaults[kMPAppLastUseDateKey];
+    XCTAssertNotNil(lastUseDate);
+    XCTAssertEqualObjects(lastUseDate, @0);
+}
+
 @end

UnitTests/ObjCTests/MPURLRequestBuilderTests.m

@@ -226,6 +226,25 @@ - (void)testURLRequestComposition {
     }
 }
 
+- (void)testBuildReturnsNilWhenConfigQueryExceedsMaxLength {
+    NSMutableString *longQueryValue = [NSMutableString stringWithCapacity:9000];
+    for (NSInteger i = 0; i < 9000; i++) {
+        [longQueryValue appendString:@"a"];
+    }
+
+    NSString *urlString = [NSString stringWithFormat:@"https://config2.mparticle.com/v4/unit_test_app_key/config?plan_id=%@", longQueryValue];
+    NSURL *defaultURL = [NSURL URLWithString:urlString];
+    NSURL *modifiedURL = [NSURL URLWithString:urlString];
+    XCTAssertNotNil(defaultURL);
+    XCTAssertNotNil(modifiedURL);
+
+    MPURL *url = [[MPURL alloc] initWithURL:modifiedURL defaultURL:defaultURL];
+    MPURLRequestBuilder *builder = [MPURLRequestBuilder newBuilderWithURL:url message:nil httpMethod:@"GET"];
+    NSMutableURLRequest *request = [builder build];
+
+    XCTAssertNil(request);
+}
+
 - (void)testEtag {
     NSDictionary *configuration1 = @{
                                      @"id":@42,

mParticle-Apple-SDK.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name             = "mParticle-Apple-SDK"
-    s.version          = "8.44.0"
+    s.version          = "8.44.3"
     s.summary          = "mParticle Apple SDK."
 
     s.description      = <<-DESC