Cherry pick FM-1761

Author: tomekkuzma-mega

iMEGA/Cloud drive/CloudDriveViewControllerFactory.swift

@@ -318,7 +318,7 @@ struct CloudDriveViewControllerFactory {
             selection: {
                 router.didTapNode(
                     nodeHandle: $0.id,
-                    allNodeHandles: [], // photo browser does not work until we pass in this array here
+                    allNodeHandles: nil,
                     displayMode: config.displayMode?.carriedOverDisplayMode
                 )
             },

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

@@ -13,14 +13,14 @@ final class NodeOpener {
     /// when file is a media, media browser with scroll through nodes in the allNodes array
     func openNode(
         nodeHandle: HandleEntity,
-        allNodes: [HandleEntity] = [],
+        allNodes: [HandleEntity]? = nil,
         config: NodeBrowserConfig = .default
     ) {
         guard
             let megaNode = sdk.node(forHandle: nodeHandle)
         else { return }
 
-        let allMegaNodes = allNodes.compactMap { sdk.node(forHandle: $0) }
+        let allMegaNodes = allNodes?.compactMap { sdk.node(forHandle: $0) }
 
         switch megaNode.isFolder() {
         case true: openFolderNode(megaNode, config: config)
@@ -81,7 +81,13 @@ final class NodeOpener {
         let allVisualMediaNodes: [MEGANode] = allNodes?.filter { node in
             node.name?.fileExtensionGroup.isVisualMedia == true
         } ?? []
-        let nodes = allNodes != nil ? allVisualMediaNodes : [node]
+        // `nodes` array cannot be empty (but can, and is often nil)
+        // as photo browser assumes node is inside this array.
+        // best to enforce it in here just before we initiate MEGAPhotoBrowserViewController
+        // there's no easy way to enforce it in the method interface,
+        // and we would need to check
+        // type of node and allNode at each call site
+        let nodes = allVisualMediaNodes.isNotEmpty ? 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/Home/Scenes/HomeSearch/Router/HomeSearchResultRouter.swift

@@ -16,11 +16,11 @@ protocol NodeRouting {
         button: UIButton,
         displayMode: DisplayMode?
     )
-    
-    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity], displayMode: DisplayMode?) 
-    
-    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity])
-    
+
+    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity]?, displayMode: DisplayMode?)
+
+    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity]?)
+
     func didTapNode(nodeHandle: HandleEntity)
 }
 
@@ -71,8 +71,8 @@ final class HomeSearchResultRouter: NodeRouting {
         ) else { return }
         navigationController?.present(nodeActionViewController, animated: true, completion: nil)
     }
-    
-    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity], displayMode: DisplayMode?) {
+
+    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity]?, displayMode: DisplayMode?) {
         guard let node = nodeUseCase.nodeForHandle(nodeHandle) else { return }
         if node.isTakenDown {
             showTakenDownAlert(isFolder: node.isFolder)
@@ -85,12 +85,12 @@ final class HomeSearchResultRouter: NodeRouting {
         }
     }
 
-    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity]) {
+    func didTapNode(nodeHandle: HandleEntity, allNodeHandles: [HandleEntity]?) {
         didTapNode(nodeHandle: nodeHandle, allNodeHandles: allNodeHandles, displayMode: nil)
     }
 
     func didTapNode(nodeHandle: HandleEntity) {
-        didTapNode(nodeHandle: nodeHandle, allNodeHandles: [])
+        didTapNode(nodeHandle: nodeHandle, allNodeHandles: nil, displayMode: nil)
     }
 
     func showTakenDownAlert(isFolder: Bool) {