chore: revert ActivityTracker changes

Author: thisisabhash

AmplifyPlugins/Internal/Sources/InternalAWSPinpoint/Session/ActivityTracking/ActivityTracker.swift

@@ -81,6 +81,7 @@ class ActivityTracker: ActivityTrackerBehaviour {
     private let stateMachine: StateMachine<ApplicationState, ActivityEvent>
     private var stateMachineSubscriberToken: StateMachineSubscriberToken?
 
+    @MainActor
     private static let applicationDidMoveToBackgroundNotification: Notification.Name = {
 #if canImport(WatchKit)
     WKExtension.applicationDidEnterBackgroundNotification
@@ -91,6 +92,7 @@ class ActivityTracker: ActivityTrackerBehaviour {
 #endif
     }()
 
+    @MainActor
     private static let applicationWillMoveToForegoundNotification: Notification.Name = {
     #if canImport(WatchKit)
         WKExtension.applicationWillEnterForegroundNotification
@@ -101,7 +103,8 @@ class ActivityTracker: ActivityTrackerBehaviour {
     #endif
     }()
 
-    nonisolated(unsafe) private static var applicationWillTerminateNotification: Notification.Name = {
+    @MainActor
+    private static var applicationWillTerminateNotification: Notification.Name = {
     #if canImport(WatchKit)
         // There's no willTerminateNotification on watchOS, so using applicationWillResignActive instead.
         WKExtension.applicationWillResignActiveNotification
@@ -112,6 +115,7 @@ class ActivityTracker: ActivityTrackerBehaviour {
     #endif
     }()
 
+    @MainActor
     private static let notifications = [
         applicationDidMoveToBackgroundNotification,
         applicationWillMoveToForegoundNotification,
@@ -145,6 +149,7 @@ class ActivityTracker: ActivityTrackerBehaviour {
         stateMachineSubscriberToken = stateMachine.subscribe(listener)
     }
 
+    @MainActor
     private func beginBackgroundTracking() {
         #if canImport(UIKit) && !os(watchOS)
         if backgroundTrackingTimeout > 0 {
@@ -161,6 +166,7 @@ class ActivityTracker: ActivityTrackerBehaviour {
         }
     }
 
+    @MainActor
     private func stopBackgroundTracking() {
         backgroundTimer = nil
     #if canImport(UIKit) && !os(watchOS)
@@ -172,6 +178,7 @@ class ActivityTracker: ActivityTrackerBehaviour {
     #endif
     }
 
+    @MainActor
     @objc private func handleApplicationStateChange(_ notification: Notification) {
         switch notification.name {
         case Self.applicationDidMoveToBackgroundNotification:

AmplifyPlugins/Internal/Tests/InternalAWSPinpointUnitTests/ActivityTrackerTests.swift

@@ -20,6 +20,7 @@ class ActivityTrackerTests: XCTestCase {
     private var stateMachine: MockStateMachine!
     private var timeout: TimeInterval = 1
 
+    @MainActor
     private static let applicationDidMoveToBackgroundNotification: Notification.Name = {
 #if canImport(WatchKit)
     WKExtension.applicationDidEnterBackgroundNotification
@@ -30,6 +31,7 @@ class ActivityTrackerTests: XCTestCase {
 #endif
     }()
 
+    @MainActor
     private static let applicationWillMoveToForegoundNotification: Notification.Name = {
 #if canImport(WatchKit)
     WKExtension.applicationWillEnterForegroundNotification
@@ -40,6 +42,7 @@ class ActivityTrackerTests: XCTestCase {
 #endif
     }()
 
+    @MainActor
     private static let applicationWillTerminateNotification: Notification.Name = {
 #if canImport(WatchKit)
     WKExtension.applicationWillResignActiveNotification
@@ -77,9 +80,9 @@ class ActivityTrackerTests: XCTestCase {
         stateMachine.processExpectation = expectation(description: "Application state changed")
         stateMachine.processExpectation?.expectedFulfillmentCount = 3
 
-        NotificationCenter.default.post(Notification(name: Self.applicationDidMoveToBackgroundNotification))
-        NotificationCenter.default.post(Notification(name: Self.applicationWillMoveToForegoundNotification))
-        NotificationCenter.default.post(Notification(name: Self.applicationWillTerminateNotification))
+        await NotificationCenter.default.post(Notification(name: Self.applicationDidMoveToBackgroundNotification))
+        await NotificationCenter.default.post(Notification(name: Self.applicationWillMoveToForegoundNotification))
+        await NotificationCenter.default.post(Notification(name: Self.applicationWillTerminateNotification))
 
         await fulfillment(of: [stateMachine.processExpectation!], timeout: 1)
         XCTAssertTrue(stateMachine.processedEvents.contains(.applicationDidMoveToBackground))