move new code to swift

Author: BrandonStalnaker

UnitTests/MParticle+PrivateMethods.h

@@ -52,6 +52,7 @@
 
 @property (nonatomic, strong, nonnull) id<MPBackendControllerProtocol> backendController;
 @property (nonatomic, strong) id<MPAppNotificationHandlerProtocol> appNotificationHandler;
+@property (nonatomic, strong) SceneDelegateHandler *sceneDelegateHandler;
 @property (nonatomic, strong) id<SettingsProviderProtocol> settingsProvider;
 @property (nonatomic, strong, nullable) id<MPDataPlanFilterProtocol> dataPlanFilter;
 @property (nonatomic, strong, nonnull) id<MPListenerControllerProtocol> listenerController;

UnitTests/Mocks/SceneDelegateHandlerMock.swift

@@ -0,0 +1,31 @@
+import XCTest
+#if MPARTICLE_LOCATION_DISABLE
+    import mParticle_Apple_SDK_NoLocation
+#else
+    import mParticle_Apple_SDK
+#endif
+
+class SceneDelegateHandlerMock: OpenURLHandlerProtocol {
+    
+    var openURLWithOptionsCalled = false
+    var openURLWithOptionsURLParam: URL?
+    var openURLWithOptionsOptionsParam: [String : Any]?
+    
+    func open(_ url: URL, options: [String : Any]?) {
+        openURLWithOptionsCalled = true
+        openURLWithOptionsURLParam = url
+        openURLWithOptionsOptionsParam = options
+    }
+    
+    var continueUserActivityCalled = false
+    var continueUserActivityUserActivityParam: NSUserActivity?
+    var continueUserActivityRestorationHandlerParam: (([UIUserActivityRestoring]?) -> Void)?
+    var continueUserActivityReturnValue: Bool = false
+    
+    func continueUserActivity(_ userActivity: NSUserActivity, restorationHandler: @escaping ([any UIUserActivityRestoring]?) -> Void) -> Bool {
+        continueUserActivityCalled = true
+        continueUserActivityUserActivityParam = userActivity
+        continueUserActivityRestorationHandlerParam = restorationHandler
+        return continueUserActivityReturnValue
+    }
+}

UnitTests/SwiftTests/MParticle/MParticleSceneDelegateTests.swift

@@ -6,42 +6,37 @@ import mParticle_Apple_SDK
 #endif
 import XCTest
 
-final class MParticleSceneDelegateTests: MParticleTestBase {
+final class MParticleSceneDelegateTests: XCTestCase {
 
     // MARK: - Properties
-    
+    var mparticle: MParticle!
+    var sceneMock: SceneDelegateHandlerMock!
     var testURL: URL!
     var testUserActivity: NSUserActivity!
 
     override func setUp() {
         super.setUp()
+        mparticle = MParticle()
         testURL = URL(string: "myapp://test/path?param=value")!
         testUserActivity = NSUserActivity(activityType: "com.test.activity")
         testUserActivity.title = "Test Activity"
         testUserActivity.userInfo = ["key": "value"]
 
         // The implementation calls [MParticle sharedInstance], so we need to set the mock on the shared instance
-        MParticle.sharedInstance().appNotificationHandler = appNotificationHandler
-        
-        // Reset mock state for each test
-        appNotificationHandler.continueUserActivityCalled = false
-        appNotificationHandler.continueUserActivityUserActivityParam = nil
-        appNotificationHandler.continueUserActivityRestorationHandlerParam = nil
-        appNotificationHandler.openURLWithOptionsCalled = false
-        appNotificationHandler.openURLWithOptionsURLParam = nil
-        appNotificationHandler.openURLWithOptionsOptionsParam = nil
+        sceneMock = SceneDelegateHandlerMock()
+        let sceneHandler = SceneDelegateHandler(logger: MPLog(logLevel: .verbose), appNotificationHandler: sceneMock)
+        mparticle.sceneDelegateHandler = sceneHandler
     }
 
-    // MARK: - handleUserActivity Tests
-    
+    // MARK: - handleUserActivity Tests    
     func test_handleUserActivity_invokesAppNotificationHandler() {
         // Act
         mparticle.handleUserActivity(testUserActivity)
 
         // Assert - handleUserActivity directly calls the app notification handler
-        XCTAssertTrue(appNotificationHandler.continueUserActivityCalled)
-        XCTAssertEqual(appNotificationHandler.continueUserActivityUserActivityParam, testUserActivity)
-        XCTAssertNotNil(appNotificationHandler.continueUserActivityRestorationHandlerParam)
+        XCTAssertTrue(sceneMock.continueUserActivityCalled)
+        XCTAssertEqual(sceneMock.continueUserActivityUserActivityParam, testUserActivity)
+        XCTAssertNotNil(sceneMock.continueUserActivityRestorationHandlerParam)
     }
 
     func test_handleUserActivity_withWebBrowsingActivity() {
@@ -54,19 +49,19 @@ final class MParticleSceneDelegateTests: MParticleTestBase {
         mparticle.handleUserActivity(webActivity)
 
         // Assert - Direct call to app notification handler
-        XCTAssertTrue(appNotificationHandler.continueUserActivityCalled)
-        XCTAssertEqual(appNotificationHandler.continueUserActivityUserActivityParam, webActivity)
+        XCTAssertTrue(sceneMock.continueUserActivityCalled)
+        XCTAssertEqual(sceneMock.continueUserActivityUserActivityParam, webActivity)
     }
 
     func test_handleUserActivity_restorationHandlerIsEmpty() {
         // Act
         mparticle.handleUserActivity(testUserActivity)
 
         // Assert
-        XCTAssertTrue(appNotificationHandler.continueUserActivityCalled)
+        XCTAssertTrue(sceneMock.continueUserActivityCalled)
 
         // Verify the restoration handler is provided and safe to call
-        let restorationHandler = appNotificationHandler.continueUserActivityRestorationHandlerParam
+        let restorationHandler = sceneMock.continueUserActivityRestorationHandlerParam
         XCTAssertNotNil(restorationHandler)
 
         // Test that calling the restoration handler doesn't crash

mParticle-Apple-SDK.xcodeproj/project.pbxproj

@@ -570,6 +570,8 @@
 		7E15B2072D94617900C1FF3E /* MPRoktTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 7E15B2052D94617900C1FF3E /* MPRoktTests.m */; };
 		7E573D2A2ECB65D90087185D /* MParticleSceneDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E573D292ECB65D90087185D /* MParticleSceneDelegateTests.swift */; };
 		7E573D2B2ECB65D90087185D /* MParticleSceneDelegateTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E573D292ECB65D90087185D /* MParticleSceneDelegateTests.swift */; };
+		7E87E0C12EE093E100A18E3A /* SceneDelegateHandlerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E87E0BE2EE093E100A18E3A /* SceneDelegateHandlerMock.swift */; };
+		7E87E0C22EE093E100A18E3A /* SceneDelegateHandlerMock.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7E87E0BE2EE093E100A18E3A /* SceneDelegateHandlerMock.swift */; };
 		B31360F92E012760000DFBC9 /* MPRoktEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B31360F72E012760000DFBC9 /* MPRoktEvent.swift */; };
 		B3D778622E02F55F00D887A4 /* MPRoktEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = B31360F72E012760000DFBC9 /* MPRoktEvent.swift */; };
 		D30CD0CB2CFF5FB100F5148A /* MPStateMachine.h in Headers */ = {isa = PBXBuildFile; fileRef = 53A79B0629CDFB1F00E7489F /* MPStateMachine.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -929,6 +931,7 @@
 		7E0387802DB913D2003B7D5E /* MPRokt.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPRokt.m; sourceTree = "<group>"; };
 		7E15B2052D94617900C1FF3E /* MPRoktTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPRoktTests.m; sourceTree = "<group>"; };
 		7E573D292ECB65D90087185D /* MParticleSceneDelegateTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MParticleSceneDelegateTests.swift; sourceTree = "<group>"; };
+		7E87E0BE2EE093E100A18E3A /* SceneDelegateHandlerMock.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SceneDelegateHandlerMock.swift; path = UnitTests/Mocks/SceneDelegateHandlerMock.swift; sourceTree = "<group>"; };
 		B31360F72E012760000DFBC9 /* MPRoktEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MPRoktEvent.swift; sourceTree = "<group>"; };
 		D33C8B312B8510C20012EDFD /* MPAudience.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPAudience.h; sourceTree = "<group>"; };
 		D33C8B322B8510C20012EDFD /* MPAudience.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MPAudience.m; sourceTree = "<group>"; };
@@ -1011,6 +1014,7 @@
 		53A79A6F29CCCD6400E7489F = {
 			isa = PBXGroup;
 			children = (
+				7E87E0BE2EE093E100A18E3A /* SceneDelegateHandlerMock.swift */,
 				D3BA75152B614E3D008C3C65 /* PrivacyInfo.xcprivacy */,
 				53A79CFE29CE12AB00E7489F /* mParticle-Apple-SDK.modulemap */,
 				53A79CFF29CE23D600E7489F /* mParticle-Apple-SDK-NoLocation.modulemap */,
@@ -1948,6 +1952,7 @@
 				534CD27B29CE2CE1008452B3 /* MPZipTests.m in Sources */,
 				7231B8522EB964A1001565E5 /* MParticleOpenURLTests.swift in Sources */,
 				53E20DC82CBFFCD200146A97 /* NSArray+MPCaseInsensitiveTests.swift in Sources */,
+				7E87E0C22EE093E100A18E3A /* SceneDelegateHandlerMock.swift in Sources */,
 				534CD27C29CE2CE1008452B3 /* MPIntegrationAttributesTest.m in Sources */,
 				356752932E60928B00DEEE23 /* MPStateMachineMock.swift in Sources */,
 				534CD27D29CE2CE1008452B3 /* MPDataModelTests.m in Sources */,
@@ -2169,6 +2174,7 @@
 				53E20DC72CBFFCD200146A97 /* NSArray+MPCaseInsensitiveTests.swift in Sources */,
 				7231B8532EB964A1001565E5 /* MParticleOpenURLTests.swift in Sources */,
 				53A79CEC29CE019F00E7489F /* MPZipTests.m in Sources */,
+				7E87E0C12EE093E100A18E3A /* SceneDelegateHandlerMock.swift in Sources */,
 				356752942E60928B00DEEE23 /* MPStateMachineMock.swift in Sources */,
 				53A79CCC29CE019F00E7489F /* MPIntegrationAttributesTest.m in Sources */,
 				53A79CBD29CE019F00E7489F /* MPDataModelTests.m in Sources */,

mParticle-Apple-SDK/Include/mParticle.h

@@ -790,13 +790,15 @@ Defaults to false. Prevents the eventsHost above from overwriting the alias endp
  */
 - (BOOL)continueUserActivity:(nonnull NSUserActivity *)userActivity restorationHandler:(void(^ _Nonnull)(NSArray<id<UIUserActivityRestoring>> * __nullable restorableObjects))restorationHandler DEPRECATED_MSG_ATTRIBUTE("iOS 27 will no longer support this protocol method");
 
+#if TARGET_OS_IOS == 1
 /**
  Informs the mParticle SDK the app has been asked to open a resource identified by a URL.
  This method should be called only if proxiedAppDelegate is disabled. This method is only available for iOS 13 and above.
  @param urlContext The UIOpenURLContext provided by the SceneDelegate
  @see proxiedAppDelegate
  */
 - (void)handleURLContext:(UIOpenURLContext *)urlContext NS_SWIFT_NAME(handleURLContext(_:)) API_AVAILABLE(ios(13.0));
+#endif
 
 /**
  Informs the mParticle SDK the app has been asked to open to continue an NSUserActivity.

mParticle-Apple-SDK/SceneDelegateHandler.swift

@@ -1,14 +1,7 @@
-//
-//  SceneDelegateHandler.swift
-//  mParticle-Apple-SDK
-//
-//  Created by Denis Chilik on 12/2/25.
-//
-
 import Foundation
 
 @objc
-public protocol OpenUrlHandlerProtocol {
+public protocol OpenURLHandlerProtocol {
     func open(_ url: URL, options: [String: Any]?)
     func continueUserActivity(
         _ userActivity: NSUserActivity,
@@ -19,31 +12,32 @@ public protocol OpenUrlHandlerProtocol {
 @objcMembers
 public class SceneDelegateHandler: NSObject {
     private let logger: MPLog
-    private let appNotificationHandler: OpenUrlHandlerProtocol
+    private let appNotificationHandler: OpenURLHandlerProtocol
 
-    public init(logger: MPLog, appNotificationHandler: OpenUrlHandlerProtocol) {
+    public init(logger: MPLog, appNotificationHandler: OpenURLHandlerProtocol) {
         self.logger = logger
         self.appNotificationHandler = appNotificationHandler
     }
 
+    #if os(iOS)
+    @available(iOS 13.0, *)
     @available(iOSApplicationExtension 13.0, *)
     public func handle(urlContext: UIOpenURLContext) {
         logger.debug("Opening URLContext URL: \(urlContext.url)")
         logger.debug("Source: \(String(describing: urlContext.options.sourceApplication ?? "unknown"))")
         logger.debug("Annotation: \(String(describing: urlContext.options.annotation))")
-        #if os(iOS)
         if #available(iOS 14.5, *) {
             logger.debug("Event Attribution: \(String(describing: urlContext.options.eventAttribution))")
         }
-        #endif
         logger.debug("Open in place: \(urlContext.options.openInPlace ? "True" : "False")")
 
         let options = ["UIApplicationOpenURLOptionsSourceApplicationKey": urlContext.options.sourceApplication];
 
         self.appNotificationHandler.open(urlContext.url, options: options as [String: Any])
     }
+    #endif
 
-    public func continueUserActivity(_ userActivity: NSUserActivity) {
+    public func handleUserActivity(_ userActivity: NSUserActivity) {
         logger.debug("User Activity Received")
         logger.debug("User Activity Type: \(userActivity.activityType)")
         logger.debug("User Activity Title: \(userActivity.title ?? "")")

mParticle-Apple-SDK/mParticle.m

@@ -54,7 +54,8 @@ @interface MParticle() <MPBackendControllerDelegate
 @property (nonatomic, strong) id<MPStateMachineProtocol> stateMachine;
 @property (nonatomic, strong) MPKitContainer_PRIVATE *kitContainer_PRIVATE;
 @property (nonatomic, strong) id<MPKitContainerProtocol> kitContainer;
-@property (nonatomic, strong) id<MPAppNotificationHandlerProtocol, OpenUrlHandlerProtocol> appNotificationHandler;
+@property (nonatomic, strong) id<MPAppNotificationHandlerProtocol, OpenURLHandlerProtocol> appNotificationHandler;
+@property (nonatomic, strong) SceneDelegateHandler *sceneDelegateHandler;
 @property (nonatomic, strong, nonnull) id<MPBackendControllerProtocol> backendController;
 @property (nonatomic, strong, nonnull) MParticleOptions *options;
 @property (nonatomic, strong, nullable) MPKitActivity *kitActivity;
@@ -98,6 +99,7 @@ @implementation MParticle
 @synthesize listenerController = _listenerController;
 static id<ExecutorProtocol> executor;
 MPLog* logger;
+@synthesize sceneDelegateHandler = _sceneDelegateHandler;
 
 + (void)initialize {
     if (self == [MParticle class]) {
@@ -149,13 +151,14 @@ - (instancetype)init {
     _collectSearchAdsAttribution = NO;
     _trackNotifications = YES;
     _automaticSessionTracking = YES;
-    _appNotificationHandler = [[MPAppNotificationHandler alloc] init];
+    _appNotificationHandler = (id<MPAppNotificationHandlerProtocol, OpenURLHandlerProtocol>)[[MPAppNotificationHandler alloc] init];
     _stateMachine = [[MPStateMachine_PRIVATE alloc] init];
     _webView = [[MParticleWebView_PRIVATE alloc] initWithMessageQueue:executor.messageQueue];
     _listenerController = MPListenerController.sharedInstance;
     _appEnvironmentProvider = [[AppEnvironmentProvider alloc] init];
     _notificationController = [[MPNotificationController_PRIVATE alloc] init];
     logger = [[MPLog alloc] initWithLogLevel:_stateMachine.logLevel];
+    _sceneDelegateHandler = [[SceneDelegateHandler alloc] initWithLogger:logger appNotificationHandler:_appNotificationHandler];
 
     return self;
 }
@@ -700,13 +703,14 @@ - (BOOL)continueUserActivity:(nonnull NSUserActivity *)userActivity restorationH
 
 
 
+#if TARGET_OS_IOS == 1
 - (void)handleURLContext:(UIOpenURLContext *)urlContext API_AVAILABLE(ios(13.0)) {
-    MPartiche.shredInstanse.hsceneDelegareHandler.andleURLContext
-    [handler handleWithUrlContext:urlContext];
+    [self.sceneDelegateHandler handleWithUrlContext:urlContext];
 }
+#endif
 
 - (void)handleUserActivity:(NSUserActivity *)userActivity {
-    [handler handleUserActivity:userActivity];
+    [self.sceneDelegateHandler handleUserActivity:userActivity];
 }
 
 - (void)reset:(void (^)(void))completion {