Fix Playlist Managed popup showing when it shouldn't

Fix Playlist not pausing the web-page video on iPad when playing (so users hear double audio) Fix Playlist not continuing to the next video/audio in Picture-In-Picture Signed-off-by: Brandon T <[email protected]>
brave · Dec 13, 2023 · ae5348f · ae5348f
1 parent e9f185f
commit ae5348f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 15 deletions.
diff --git a/...rontend/Browser/Playlist/Controllers/PlaylistListViewController+TableViewDataSource.swift b/...rontend/Browser/Playlist/Controllers/PlaylistListViewController+TableViewDataSource.swift
@@ -178,7 +178,7 @@ extension PlaylistListViewController: UITableViewDataSource {
       header.onAddPlaylist = { [unowned self] in
         guard let sharedFolderUrl = folder.sharedFolderUrl else { return }
 
-        if PlayListDownloadType(rawValue: Preferences.Playlist.autoDownloadVideo.value) != nil {
+        if PlayListDownloadType(rawValue: Preferences.Playlist.autoDownloadVideo.value) != .off {
           let controller = PopupViewController(rootView: PlaylistFolderSharingManagementView(onAddToPlaylistPressed: { [unowned self] in
             self.dismiss(animated: true)
 

diff --git a/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift b/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistListViewController.swift
@@ -637,7 +637,7 @@ extension PlaylistListViewController {
       return
     }
 
-    playerView.stop()
+    playerView.pause()
     playerView.bringSubviewToFront(activityIndicator)
     activityIndicator.startAnimating()
     activityIndicator.isHidden = false

diff --git a/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistViewController.swift b/Sources/Brave/Frontend/Browser/Playlist/Controllers/PlaylistViewController.swift
@@ -581,6 +581,7 @@ extension PlaylistViewController: PlaylistViewControllerDelegate {
     stop(playerView)
 
     // Cancel all loading.
+    PlaylistManager.shared.playbackTask?.cancel()
     PlaylistManager.shared.playbackTask = nil
   }
 
@@ -864,7 +865,12 @@ extension PlaylistViewController: VideoViewDelegate {
   }
 
   func load(_ videoView: VideoView, asset: AVURLAsset, autoPlayEnabled: Bool) async throws /*`MediaPlaybackError`*/ {
-    self.clear()
+    // Task will be nil if the playback has stopped, but not paused
+    // If it is paused, and we're loading another track, don't bother clearing the player
+    // as this will break PIP
+    if PlaylistManager.shared.playbackTask == nil {
+      self.clear()
+    }
 
     let isNewItem = try await player.load(asset: asset)
 

diff --git a/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCarplayManager.swift b/Sources/Brave/Frontend/Browser/Playlist/Managers & Cache/PlaylistCarplayManager.swift
@@ -108,12 +108,11 @@ public class PlaylistCarplayManager: NSObject {
 
   func getPlaylistController(tab: Tab?, initialItem: PlaylistInfo?, initialItemPlaybackOffset: Double) -> PlaylistViewController {
 
-    // If background playback is enabled, tabs will continue to play media
+    // If background playback is enabled (on iPhone), tabs will continue to play media
     // Even if another controller is presented and even when PIP is enabled in playlist.
     // Therefore we need to stop the page/tab from playing when using playlist.
-    if Preferences.General.mediaAutoBackgrounding.value {
-      tab?.stopMediaPlayback()
-    }
+    // On iPad, media will continue to play with or without the background play setting.
+    tab?.stopMediaPlayback()
 
     // If there is no media player, create one,
     // pass it to the play-list controller

diff --git a/...es/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/Paged/PlaylistScript.js b/...es/Brave/Frontend/UserContent/UserScripts/Scripts_Dynamic/Scripts/Paged/PlaylistScript.js
@@ -164,6 +164,14 @@ window.__firefox__.includeOnce("Playlist", function($) {
            style.visibility !== 'hidden';
   }
 
+  function getAllVideoElements() {
+    return [...document.querySelectorAll('video')].reverse();
+  }
+
+  function getAllAudioElements() {
+    return [...document.querySelectorAll('audio')].reverse();
+  }
+
   function setupLongPress() {
     Object.defineProperty(window.__firefox__, '$<playlistLongPressed>', {
       enumerable: false,
@@ -220,14 +228,6 @@ window.__firefox__.includeOnce("Playlist", function($) {
   // MARK: ---------------------------------------
 
   function setupDetector() {
-    function getAllVideoElements() {
-      return [...document.querySelectorAll('video')].reverse();
-    }
-
-    function getAllAudioElements() {
-      return [...document.querySelectorAll('audio')].reverse();
-    }
-
     function requestWhenIdleShim(fn) {
       var start = Date.now()
       return setTimeout(function () {