T20838501: do not remove delegates when viewWillDissapear

Author: jnavarrom

MEGAUnitTests/AudioPlayer/ViewModel/AudioPlayerViewModelTests.swift

@@ -59,7 +59,7 @@ final class AudioPlayerViewModelTests: XCTestCase {
         await test(viewModel: onlineSUT, action: .onRepeatPressed, expectedCommands: [.updateRepeat(status: .none)])
         XCTAssertEqual(playerHandler.onRepeatDisabled_calledTimes, 1)
 
-        await test(viewModel: onlineSUT, action: .viewDidDissapear(reason: .userInitiatedDismissal), expectedCommands: [])
+        await test(viewModel: onlineSUT, action: .viewDidDisappear, expectedCommands: [])
         XCTAssertEqual(playerHandler.removePlayerListener_calledTimes, 1)
 
         await test(viewModel: onlineSUT, action: .onChangeSpeedModePressed, expectedCommands: [.updateSpeed(mode: .oneAndAHalf)])
@@ -86,10 +86,10 @@ final class AudioPlayerViewModelTests: XCTestCase {
         await test(viewModel: onlineSUT, action: .showPlaylist, expectedCommands: [])
         XCTAssertEqual(onlineRouter.goToPlaylist_calledTimes, 1)
 
-        await test(viewModel: onlineSUT, action: .viewDidDissapear(reason: .userInitiatedDismissal), expectedCommands: [])
+        await test(viewModel: onlineSUT, action: .viewWillDisappear(reason: .userInitiatedDismissal), expectedCommands: [])
         XCTAssertEqual(onlineRouter.showMiniPlayer_calledTimes, 1)
 
-        await test(viewModel: offlineSUT, action: .viewDidDissapear(reason: .userInitiatedDismissal), expectedCommands: [])
+        await test(viewModel: offlineSUT, action: .viewWillDisappear(reason: .userInitiatedDismissal), expectedCommands: [])
         XCTAssertEqual(offlineRouter.showMiniPlayer_calledTimes, 1)
 
         await test(viewModel: onlineSUT, action: .initMiniPlayer, expectedCommands: [])
@@ -219,24 +219,24 @@ final class AudioPlayerViewModelTests: XCTestCase {
         )
     }
 
-    // MARK: - viewDidDissapear
+    // MARK: - viewWillDisappear
 
     @MainActor
-    func testViewDidDissapear_whenLoggedInAndDisappearReasonUserInitiatedDismissal_initMiniPlayer() {
+    func testViewWillDisappear_whenLoggedInAndDisappearReasonUserInitiatedDismissal_initMiniPlayer() {
         let loggedInAccountUseCase = MockAccountUseCase(isLoggedIn: true)
         let defaultConfigEntity = audioPlayerConfigEntity(node: anyAudioNode)
         let (sut, _, router) = makeSUT(
             configEntity: defaultConfigEntity,
             accountUseCase: loggedInAccountUseCase
         )
 
-        sut.dispatch(.viewDidDissapear(reason: .userInitiatedDismissal))
+        sut.dispatch(.viewWillDisappear(reason: .userInitiatedDismissal))
 
         XCTAssertEqual(router.showNodesMiniPlayer_calledTimes, 1)
     }
 
     @MainActor
-    func testViewDidDissapear_whenNotLoggedInAndDisappearReasonUserInitiatedDismissal_stopsPlayer() {
+    func testViewWillDisappear_whenNotLoggedInAndDisappearReasonUserInitiatedDismissal_stopsPlayer() {
         let loggedInAccountUseCase = MockAccountUseCase(isLoggedIn: false)
         let streamingInfoUseCase = MockStreamingInfoUseCase()
         let defaultConfigEntity = audioPlayerConfigEntity(node: anyAudioNode)
@@ -247,7 +247,7 @@ final class AudioPlayerViewModelTests: XCTestCase {
         )
         sut.dispatch(.onViewDidLoad)
 
-        sut.dispatch(.viewDidDissapear(reason: .userInitiatedDismissal))
+        sut.dispatch(.viewWillDisappear(reason: .userInitiatedDismissal))
 
         guard let playerHandler = defaultConfigEntity.playerHandler as? MockAudioPlayerHandler else {
             XCTFail("Expect to have mock audio player handler type: \(type(of: MockAudioPlayerHandler.self)), but got different type.")
@@ -259,7 +259,7 @@ final class AudioPlayerViewModelTests: XCTestCase {
     }
 
     @MainActor
-    func testViewDidDissapear_whenNotLoggedInAndDisappearReasonSystemPushedAnotherView_shouldNotStopsPlayer() {
+    func testViewWillDisappear_whenNotLoggedInAndDisappearReasonSystemPushedAnotherView_shouldNotStopsPlayer() {
         let loggedInAccountUseCase = MockAccountUseCase(isLoggedIn: false)
         let streamingInfoUseCase = MockStreamingInfoUseCase()
         let defaultConfigEntity = audioPlayerConfigEntity(node: anyAudioNode)
@@ -270,7 +270,7 @@ final class AudioPlayerViewModelTests: XCTestCase {
         )
         sut.dispatch(.onViewDidLoad)
 
-        sut.dispatch(.viewDidDissapear(reason: .systemPushedAnotherView))
+        sut.dispatch(.viewWillDisappear(reason: .systemPushedAnotherView))
 
         guard let playerHandler = defaultConfigEntity.playerHandler as? MockAudioPlayerHandler else {
             XCTFail("Expect to have mock audio player handler type: \(type(of: MockAudioPlayerHandler.self)), but got different type.")

iMEGA/AudioPlayer/Scenes/AudioPlayerScene/AudioPlayerViewController.swift

@@ -72,21 +72,26 @@ class AudioPlayerViewController: UIViewController, AudioPlayerViewControllerNode
     override func viewWillDisappear(_ animated: Bool) {
         super.viewWillDisappear(animated)
         if isMovingFromParent || isBeingDismissed || presentingViewController?.isBeingDismissed == true {
-            viewModel.dispatch(.viewDidDissapear(reason: .userInitiatedDismissal))
+            viewModel.dispatch(.viewWillDisappear(reason: .userInitiatedDismissal))
         } else {
             if let selectedNodeActionTypeEntity, isSelectingSupportedNodeActionType(selectedNodeActionTypeEntity) {
-                viewModel.dispatch(.viewDidDissapear(reason: .systemPushedAnotherView))
+                viewModel.dispatch(.viewWillDisappear(reason: .systemPushedAnotherView))
             } else {
-                viewModel.dispatch(.viewDidDissapear(reason: .userInitiatedDismissal))
+                viewModel.dispatch(.viewWillDisappear(reason: .userInitiatedDismissal))
             }
             selectedNodeActionTypeEntity = nil
         }
     }
 
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        viewModel.dispatch(.viewDidDisappear)
+    }
+    
     /// Overriding dismiss function to detect dismissal of current view controller triggered from navigation controller's dismissal
     override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
         super.dismiss(animated: flag, completion: completion)
-        viewModel.dispatch(.viewDidDissapear(reason: .userInitiatedDismissal))
+        viewModel.dispatch(.viewWillDisappear(reason: .userInitiatedDismissal))
     }
 
     deinit {

iMEGA/AudioPlayer/Scenes/AudioPlayerScene/AudioPlayerViewModel.swift

@@ -8,7 +8,7 @@ import MEGAPresentation
 enum AudioPlayerAction: ActionType {
 
     /// Enum to represent the reasons for the dissapearance  of a view.
-    enum ViewDisappearReason {
+    enum ViewWillDisappearReason {
         /// User dismissal means the user initiated the dismissal of the screen (e.g., tapping the close button or swiping down to close the audio player view).
         case userInitiatedDismissal
 
@@ -17,7 +17,8 @@ enum AudioPlayerAction: ActionType {
     }
 
     case onViewDidLoad
-    case viewDidDissapear(reason: ViewDisappearReason)
+    case viewWillDisappear(reason: ViewWillDisappearReason)
+    case viewDidDisappear
     case initMiniPlayer
     case updateCurrentTime(percentage: Float)
     case progressDragEventBegan
@@ -465,14 +466,15 @@ final class AudioPlayerViewModel: ViewModelType {
         case .onTermsOfServiceViolationAlertDismissAction:
             configEntity.playerHandler.closePlayer()
             router.dismiss()
-        case .viewDidDissapear(let reason):
-            removeDelegates()
+        case .viewWillDisappear(let reason):
             switch reason {
             case .userInitiatedDismissal:
                 accountUseCase.isLoggedIn() ? initMiniPlayer() : requestStopAudioPlayerSession()
             case .systemPushedAnotherView:
                 break
             }
+        case .viewDidDisappear:
+            removeDelegates()
         case .initMiniPlayer:
             initMiniPlayer()
         }