fix(SingleTrackPlayer): Make sure we can navigate between audio file …

…previews and it works seamlessly
Infomaniak · Aug 9, 2024 · e5b86c9 · e5b86c9
1 parent 381aad5
commit e5b86c9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/kDrive/UI/View/Files/Preview/AudioCollectionViewCell.swift b/kDrive/UI/View/Files/Preview/AudioCollectionViewCell.swift
@@ -168,7 +168,7 @@ final class AudioCollectionViewCell: PreviewCollectionViewCell {
 
     override func didEndDisplaying() {
         MatomoUtils.trackMediaPlayer(leaveAt: singleTrackPlayer.progressPercentage)
-        singleTrackPlayer.reset()
+        singleTrackPlayer.pause()
     }
 
     private func updateUI(state: SingleTrackPlayer.State) {

diff --git a/kDriveCore/AudioPlayer/SingleTrackPlayer.swift b/kDriveCore/AudioPlayer/SingleTrackPlayer.swift
@@ -47,7 +47,7 @@ public final class SingleTrackPlayer {
     private var interruptionObserver: NSObjectProtocol?
     private var timeObserver: Any?
     private var rateObserver: NSKeyValueObservation?
-    private var statusObserver: NSObjectProtocol?
+    private var statusObserver: NSKeyValueObservation?
     private var isInterrupted = false
 
     // MARK: Data flow
@@ -115,17 +115,7 @@ public final class SingleTrackPlayer {
     }
 
     public func reset() {
-        if let interruptionObserver {
-            NotificationCenter.default.removeObserver(interruptionObserver)
-        }
-        interruptionObserver = nil
-        if let timeObserver {
-            player?.removeTimeObserver(timeObserver)
-        }
-        timeObserver = nil
-        rateObserver = nil
-        statusObserver = nil
-
+        removeAllObservers()
         player?.pause()
         player = nil
         playerState = .stopped
@@ -215,7 +205,7 @@ public final class SingleTrackPlayer {
 
     // MARK: - Observation
 
-    func setUpObservers() {
+    private func setUpObservers() {
         interruptionObserver = NotificationCenter.default.addObserver(forName: AVAudioSession.interruptionNotification,
                                                                       object: AVAudioSession.sharedInstance(),
                                                                       queue: .main) { [weak self] notification in
@@ -240,6 +230,22 @@ public final class SingleTrackPlayer {
         setUpRemoteControlEvents()
     }
 
+    private func removeAllObservers() {
+        if let interruptionObserver = interruptionObserver {
+            NotificationCenter.default.removeObserver(interruptionObserver)
+        }
+
+        stopPlaybackObservation()
+
+        rateObserver?.invalidate()
+        rateObserver = nil
+
+        statusObserver?.invalidate()
+        statusObserver = nil
+
+        removeAllRemoteControlEvents()
+    }
+
     public func startPlaybackObservationIfNeeded() {
         guard timeObserver == nil else {
             return
@@ -298,6 +304,10 @@ public final class SingleTrackPlayer {
         }
     }
 
+    private func removeAllRemoteControlEvents() {
+        registeredCommands.forEach { $0.removeHandler() }
+    }
+
     @objc private func playerDidFinishPlaying() {
         pause()
         seek(to: 0)