CC-6170: fix audio player not working in cloud drive, also fixes CC-5598

Author: tomekkuzma-mega

iMEGA/Cloud drive/CloudDriveViewController+Additions.swift

@@ -439,6 +439,7 @@ extension CloudDriveViewController {
         guard let searchNodesArray else {
             return nodes
         }
+        // this is done with for loop, as lightweight ObjC generics do not port to Swift when used on NSMutableArray
         for node in searchNodesArray {
             if let megaNode = node as? MEGANode {
                 nodes.append(megaNode)
@@ -447,24 +448,34 @@ extension CloudDriveViewController {
         return nodes
     }
 
+    private func nodeIsVisualMedia(_ node: MEGANode) -> Bool {
+        node.name?.fileExtensionGroup.isVisualMedia == true
+    }
+    
     // provide all currently displayed nodes
-    // - used when showing image browser, to be able to scroll through visual media
-    private var nodesToFilter: [MEGANode] {
+    // - used when showing image browser, to be able to scroll through visual media (this should pass in only search results when search active)
+    // - used when showing audio player
+    // no node filtering (based on type) should be done at this stage
+    private func allNodesForOpening(node: MEGANode) -> [MEGANode] {
+        if nodeIsVisualMedia(node) {
+            return searchResultsAwareAllNodesForOpeningVisualMedia()
+        }
+        
+        return self.nodes?.mnz_nodesArrayFromNodeList() ?? []
+    }
+    
+    // when opening visual media (image browser), we are passing in
+    // only nodes available in the list, respecting searching results
+    func searchResultsAwareAllNodesForOpeningVisualMedia() -> [MEGANode] {
         if  let searchController,
             searchController.isActive,
             searchController.searchBar.text?.mnz_isEmpty() == false {
-            Self.searchResultsNodes(from: self.searchNodesArray)
+            return Self.searchResultsNodes(from: self.searchNodesArray)
         } else {
-            self.nodes?.mnz_nodesArrayFromNodeList() ?? []
+            return self.nodes?.mnz_nodesArrayFromNodeList() ?? []
         }
     }
-    
-    private var allVisualMediaNodes: [MEGANode] {
-        nodesToFilter.filter {
-            $0.name?.fileExtensionGroup.isVisualMedia == true
-        }
-    }
-    
+ 
     @objc public func didSelectNode(_ node: MEGANode) {
         if node.isTakenDown() {
             showTakenDownAlert(isFolder: node.isFolder())
@@ -475,7 +486,7 @@ extension CloudDriveViewController {
             )
             router.didTapNode(
                 nodeHandle: node.handle,
-                allNodeHandles: allVisualMediaNodes.map { $0.handle },
+                allNodeHandles: allNodesForOpening(node: node).map { $0.handle },
                 displayMode: displayMode.carriedOverDisplayMode
             )
         }

iMEGA/Home/Scenes/Home/Router/NodeOpener.swift

@@ -52,14 +52,36 @@ final class NodeOpener {
     }
 
     // MARK: - Private
-    
-    private func openFileNode(_ node: MEGANode, allNodes: [MEGANode]?, displayMode: DisplayMode?) {
+    // CRITICAL SECTION OF THE CODE
+    // allNodes has to have all siblings of the node
+    // for the image and audio player work properly
+    private func openFileNode(
+        _ node: MEGANode,
+        allNodes: [MEGANode]?,
+        displayMode: DisplayMode?
+    ) {
+        // if we do not have an image or video, we will jump deeper to see
+        // if we have audio or other type of file
         guard node.name?.fileExtensionGroup.isVisualMedia == true else {
             node.mnz_open(in: navigationController, folderLink: false, fileLink: nil, messageId: nil, chatId: nil, allNodes: allNodes)
             return
         }
 
-        let nodes = allNodes ?? [node]
+        // open MEGAPhotoBrowserViewController on the node and allow scrolling
+        // through all visual media in the allNodes array
+        openVisualMedia(node: node, allNodes: allNodes, displayMode: displayMode)
+    }
+    
+    private func openVisualMedia(
+        node: MEGANode,
+        allNodes: [MEGANode]?,
+        displayMode: DisplayMode?
+    ) {
+        // filter the visual media from allNodes so that photo browser displays only images and videos
+        let allVisualMediaNodes: [MEGANode] = allNodes?.filter { node in
+            node.name?.fileExtensionGroup.isVisualMedia == true
+        } ?? []
+        let nodes = allNodes != nil ? allVisualMediaNodes : [node]
         let index = nodes.firstIndex(where: { $0.handle == node.handle }) ?? 0
         let mediaNodes = NSMutableArray(array: nodes)
         let isOwner = sdk.accessLevel(for: node) == .accessOwner

iMEGA/Utils/Categories/MEGANode+initAudioPlayer.swift

@@ -1,5 +1,15 @@
 extension MEGANode {
     @objc func initFullScreenPlayer(node: MEGANode?, fileLink: String?, filePaths: [String]?, isFolderLink: Bool, presenter: UIViewController, messageId: NSNumber?, chatId: NSNumber?, allNodes: [MEGANode]?) {
+        
+        // fixes [CC-5598] as we were passing in all nodes instead of just audio ones
+        // this is the same check we do on a single node, when deciding if we can pass it to
+        // audio player
+        let allAudioNodes: [MEGANode]? = allNodes?.filter { node in
+            node.name?.fileExtensionGroup.isMultiMedia == true &&
+            node.name?.fileExtensionGroup.isVideo == false &&
+            node.mnz_isPlayable()
+        }
+        
         AudioPlayerManager.shared.initFullScreenPlayer(
             node: node,
             fileLink: fileLink,
@@ -8,7 +18,7 @@ extension MEGANode {
             presenter: presenter,
             messageId: messageId?.uint64Value ?? .invalid,
             chatId: chatId?.uint64Value ?? .invalid,
-            allNodes: allNodes
+            allNodes: allAudioNodes
         )
     }
 }