Updates based on CR suggestions.

Author: jaclync

WooCommerce/Classes/AppDelegate.swift

@@ -421,7 +421,7 @@ extension AppDelegate {
 
 extension AppDelegate: UNUserNotificationCenterDelegate {
     func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse) async {
-        await ServiceLocator.pushNotesManager.handleUserResponseToNotification(response: response)
+        await ServiceLocator.pushNotesManager.handleUserResponseToNotification(response)
     }
 
     func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification) async -> UNNotificationPresentationOptions {

WooCommerce/Classes/Notifications/PushNotificationsManager.swift

@@ -47,7 +47,7 @@ final class PushNotificationsManager: PushNotesManager {
 
     /// An observable that emits values when a local notification is received.
     ///
-    var localNotificationResponses: AnyPublisher<UNNotificationResponse, Never> {
+    var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> {
         localNotificationResponsesSubject.eraseToAnyPublisher()
     }
 
@@ -268,27 +268,25 @@ extension PushNotificationsManager {
     }
 
     @MainActor
-    func handleUserResponseToNotification(response: UNNotificationResponse) async {
+    func handleUserResponseToNotification(_ response: UNNotificationResponse) async {
         // Remote notification response is handled separately.
         if let notification = PushNotification.from(userInfo: response.notification.request.content.userInfo) {
             handleRemoteNotificationInAllAppStates(response.notification.request.content.userInfo)
-            return await handleInactiveRemoteNotification(notification: notification)
+            await handleInactiveRemoteNotification(notification: notification)
         } else {
             localNotificationResponsesSubject.send(response)
         }
     }
 
-    /// Handles a Notification while in Background Mode
-    ///
-    /// - Parameters:
-    ///     - userInfo: The Notification's Payload
-    ///     - completionHandler: A callback, to be executed on completion
-    ///
-    /// - Returns: True when handled. False otherwise
+    /// Handles a remote notification while the app is in the background.
     ///
+    /// - Parameter userInfo: The notification's payload.
+    /// - Returns: Whether there is any data fetched in the background.
     @MainActor
     func handleRemoteNotificationInTheBackground(userInfo: [AnyHashable: Any]) async -> UIBackgroundFetchResult {
-        guard applicationState == .background, let _ = userInfo[APNSKey.identifier] else {
+        guard applicationState == .background, // Proceeds only if the app is in background.
+              let _ = userInfo[APNSKey.identifier] // Ensures that we are only processing a remote notification.
+        else {
             return .noData
         }
 
@@ -449,14 +447,9 @@ private extension PushNotificationsManager {
         _ = handleSupportNotification(userInfo)
     }
 
-    /// Handles a Remote Notification while in Inactive Mode
-    ///
-    /// - Parameters:
-    ///     - userInfo: The Notification's Payload
-    ///     - completionHandler: A callback, to be executed on completion
-    ///
-    /// - Returns: True when handled. False otherwise
+    /// Handles a remote notification while the app is inactive.
     ///
+    /// - Parameter notification: Push notification content from a remote notification.
     func handleInactiveRemoteNotification(notification: PushNotification) async {
         guard applicationState == .inactive else {
             return

WooCommerce/Classes/ServiceLocator/PushNotesManager.swift

@@ -22,7 +22,7 @@ protocol PushNotesManager {
 
     /// An observable that emits values when a local notification response is received.
     ///
-    var localNotificationResponses: AnyPublisher<UNNotificationResponse, Never> { get }
+    var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> { get }
 
     /// Resets the Badge Count.
     ///
@@ -73,7 +73,7 @@ protocol PushNotesManager {
 
     /// Handles user's response to a local or remote notification.
     /// - Parameter response: The user's response to a notification.
-    func handleUserResponseToNotification(response: UNNotificationResponse) async
+    func handleUserResponseToNotification(_ response: UNNotificationResponse) async
 
     /// Handles a local or remote notification when the app is in the foreground.
     ///

WooCommerce/Classes/ViewRelated/AppCoordinator.swift

@@ -66,7 +66,7 @@ final class AppCoordinator {
                 self.isLoggedIn = isLoggedIn
             }
 
-        localNotificationResponsesSubscription = ServiceLocator.pushNotesManager.localNotificationResponses.sink { [weak self] response in
+        localNotificationResponsesSubscription = ServiceLocator.pushNotesManager.localNotificationUserResponses.sink { [weak self] response in
             self?.handleLocalNotificationResponse(response)
         }
     }

WooCommerce/WooCommerceTests/Mocks/MockPushNotificationsManager.swift

@@ -24,7 +24,7 @@ final class MockPushNotificationsManager: PushNotesManager {
 
     private let inactiveNotificationsSubject = PassthroughSubject<PushNotification, Never>()
 
-    var localNotificationResponses: AnyPublisher<UNNotificationResponse, Never> {
+    var localNotificationUserResponses: AnyPublisher<UNNotificationResponse, Never> {
         localNotificationResponsesSubject.eraseToAnyPublisher()
     }
 
@@ -66,7 +66,7 @@ final class MockPushNotificationsManager: PushNotesManager {
         .noData
     }
 
-    func handleUserResponseToNotification(response: UNNotificationResponse) async {
+    func handleUserResponseToNotification(_ response: UNNotificationResponse) async {
 
     }
 

WooCommerce/WooCommerceTests/Notifications/PushNotificationsManagerTests.swift

@@ -313,7 +313,7 @@ final class PushNotificationsManagerTests: XCTestCase {
 
         // When
         application.applicationState = .inactive
-        await manager.handleUserResponseToNotification(response: response)
+        await manager.handleUserResponseToNotification(response)
 
         // Then
         XCTAssertEqual(application.presentDetailsNoteIDs.first, 1234)
@@ -457,7 +457,7 @@ final class PushNotificationsManagerTests: XCTestCase {
         let response = try XCTUnwrap(MockNotificationResponse(notificationUserInfo: userinfo))
 
         // When
-        _ = await manager.handleUserResponseToNotification(response: response)
+        _ = await manager.handleUserResponseToNotification(response)
 
         // Then
         XCTAssertEqual(emittedNotifications.count, 1)