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

…previews and it works seamlessly
Infomaniak · Aug 9, 2024 · 2a7ae64 · 2a7ae64
1 parent 381aad5
commit 2a7ae64
Showing 1 changed file with 22 additions and 3 deletions.
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
@@ -127,7 +127,6 @@ public final class SingleTrackPlayer {
         statusObserver = nil
 
         player?.pause()
-        player = nil
         playerState = .stopped
     }
 
@@ -215,7 +214,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 +239,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 +313,10 @@ public final class SingleTrackPlayer {
         }
     }
 
+    private func removeAllRemoteControlEvents() {
+        registeredCommands.forEach { $0.removeHandler() }
+    }
+
     @objc private func playerDidFinishPlaying() {
         pause()
         seek(to: 0)