TRAN-95. The Save to Photos action should be temporarily disabled for media node multiselection in Timeline, Albums, and Media Discovery

Author: rgmez

MEGAUnitTests/NodeActions/NodeActionBuilderTests.swift

@@ -1028,6 +1028,47 @@ class NodeActionBuilderTests: XCTestCase {
         XCTAssertTrue(isEqual(nodeActionTypes: [.download, .shareLink, .exportFile, .sendToChat, .saveToPhotos, .move, .copy, .moveToRubbishBin]))
     }
 
+    func testMultiselectMediaFiles_albumSelectionToolbar() {
+        actions = NodeActionBuilder()
+            .setNodeSelectionType(.files, selectedNodeCount: 4)
+            .setDisplayMode(.albumSelectionToolBar)
+            .setAreMediaFiles(true)
+            .multiSelectNormalAlbumBuild()
+        
+        XCTAssertTrue(isEqual(nodeActionTypes: [.download, .shareLink, .exportFile, .sendToChat, .move, .copy]))
+    }
+    
+    func testMultiselectMediaFiles_favouriteAlbumSelectionToolbar() {
+        actions = NodeActionBuilder()
+            .setNodeSelectionType(.files, selectedNodeCount: 4)
+            .setDisplayMode(.favouriteAlbumSelectionToolBar)
+            .setIsFavourite(true)
+            .setAreMediaFiles(true)
+            .multiSelectFavouriteAlbumBuild()
+        
+        XCTAssertTrue(isEqual(nodeActionTypes: [.download, .shareLink, .exportFile, .sendToChat, .favourite, .copy, .moveToRubbishBin]))
+    }
+    
+    func testMultiselectMediaFiles_PhotosTimeline() {
+        actions = NodeActionBuilder()
+            .setNodeSelectionType(.files, selectedNodeCount: 4)
+            .setAreMediaFiles(true)
+            .setIsPhotosTimeline(true)
+            .multiselectBuild()
+        
+        XCTAssertTrue(isEqual(nodeActionTypes: [.download, .shareLink, .exportFile, .sendToChat, .move, .copy, .moveToRubbishBin]))
+    }
+    
+    func testMultiselectMediaFiles_MediaDiscovery() {
+        actions = NodeActionBuilder()
+            .setNodeSelectionType(.files, selectedNodeCount: 4)
+            .setAreMediaFiles(true)
+            .setIsMediaDiscovery(true)
+            .multiselectBuild()
+        
+        XCTAssertTrue(isEqual(nodeActionTypes: [.download, .shareLink, .exportFile, .sendToChat, .move, .copy, .moveToRubbishBin]))
+    }
+    
     func testExportedNodeActions_nodeExported() {
         actions = NodeActionBuilder()
             .setDisplayMode(.cloudDrive)

iMEGA/Camera uploads/Extension/PhotosViewController+Additions.swift

@@ -1,6 +1,6 @@
 extension PhotosViewController {
     @IBAction func moreAction(_ sender: UIBarButtonItem) {
-        let nodeActionsViewController = NodeActionViewController(nodes: selection.nodes, delegate: self, displayMode: .selectionToolBar, sender: sender)
+        let nodeActionsViewController = NodeActionViewController(nodes: selection.nodes, delegate: self, displayMode: .selectionToolBar, isPhotosTimeline: true, sender: sender)
         present(nodeActionsViewController, animated: true, completion: nil)
     }
 

iMEGA/Home/Scenes/HomeExplore/View/ExplorerBaseViewController.swift

@@ -176,7 +176,7 @@ class ExplorerBaseViewController: UIViewController {
 
         let myBackupsUC = MyBackupsUseCase(myBackupsRepository: MyBackupsRepository.newRepo, nodeRepository: NodeRepository.newRepo)
         let containsABackupNode = myBackupsUC.hasBackupNode(in: selectedNodes.toNodeEntities())
-        let nodeActionsViewController = NodeActionViewController(nodes: selectedNodes, delegate: self, displayMode: .selectionToolBar, containsABackupNode: containsABackupNode, sender: button)
+        let nodeActionsViewController = NodeActionViewController(nodes: selectedNodes, delegate: self, displayMode: .selectionToolBar, containsABackupNode: containsABackupNode, isMediaDiscovery: isKind(of: MediaDiscoveryViewController.self), sender: button)
         present(nodeActionsViewController, animated: true, completion: nil)
     }
 

iMEGA/Utils/Shared Views/ViewControllers/CustomActionViewController/NodeActionBuilder.swift

@@ -25,6 +25,8 @@ final class NodeActionBuilder {
     private var isTakedown = false
     private var isVerifyContact = false
     private var areMediaFiles = false
+    private var isMediaDiscovery = false
+    private var isPhotosTimeline = false
     private var sharedFolderContact: MEGAUser = MEGAUser()
 
     func setDisplayMode(_ displayMode: DisplayMode) -> NodeActionBuilder {
@@ -155,6 +157,16 @@ final class NodeActionBuilder {
         return self
     }
 
+    func setIsMediaDiscovery(_ isMediaDiscovery: Bool) -> NodeActionBuilder {
+        self.isMediaDiscovery = isMediaDiscovery
+        return self
+    }
+    
+    func setIsPhotosTimeline(_ isPhotosTimeline: Bool) -> NodeActionBuilder {
+        self.isPhotosTimeline = isPhotosTimeline
+        return self
+    }
+    
     func build() -> [NodeAction] {
         var nodeActions = [NodeAction]()
 
@@ -188,7 +200,7 @@ final class NodeActionBuilder {
         favouriteAlbumActions()
     }
 
-    func mutiSelectNormalAlbumBuild() -> [NodeAction] {
+    func multiSelectNormalAlbumBuild() -> [NodeAction] {
         normalAlbumActions()
     }
 
@@ -697,7 +709,7 @@ final class NodeActionBuilder {
                        .exportFileAction(nodeCount: selectedNodeCount),
                        .sendToChatAction()]
 
-        if areMediaFiles {
+        if areMediaFiles && !(displayMode == .favouriteAlbumSelectionToolBar || displayMode == .albumSelectionToolBar || isMediaDiscovery || isPhotosTimeline) {
             actions.append(.saveToPhotosAction())
         }
 

iMEGA/Utils/Shared Views/ViewControllers/CustomActionViewController/NodeActionViewController.swift

@@ -97,7 +97,7 @@ class NodeActionViewController: ActionSheetViewController {
                           shouldShowVerifyContact: shouldShowVerifyContact)
     }
 
-    init(nodes: [MEGANode], delegate: NodeActionViewControllerDelegate, displayMode: DisplayMode, isIncoming: Bool = false, containsABackupNode: Bool = false, sender: Any) {
+    init(nodes: [MEGANode], delegate: NodeActionViewControllerDelegate, displayMode: DisplayMode, isIncoming: Bool = false, containsABackupNode: Bool = false, isMediaDiscovery: Bool = false, isPhotosTimeline: Bool = false, sender: Any) {
         self.nodes = nodes
         self.displayMode = displayMode
         self.delegate = delegate
@@ -131,7 +131,7 @@ class NodeActionViewController: ActionSheetViewController {
                 .setNodeSelectionType(selectionType, selectedNodeCount: nodesCount)
                 .setIsBackupNode(containsABackupNode)
                 .setAreMediaFiles(areMediaFiles)
-                .mutiSelectNormalAlbumBuild()
+                .multiSelectNormalAlbumBuild()
         } else {
             let linkedNodeCount = nodes.publicLinkedNodes().count
             actions = NodeActionBuilder()
@@ -140,6 +140,8 @@ class NodeActionViewController: ActionSheetViewController {
                 .setIsAllLinkedNode(linkedNodeCount == nodesCount)
                 .setIsBackupNode(containsABackupNode)
                 .setAreMediaFiles(areMediaFiles)
+                .setIsMediaDiscovery(isMediaDiscovery)
+                .setIsPhotosTimeline(isPhotosTimeline)
                 .multiselectBuild()
         }
     }