feat: Factorise add to my drive action

kDrive/AppRouter.swift

@@ -414,6 +414,21 @@ public struct AppRouter: AppNavigable {
         }
     }
 
+    @MainActor public func showUpsaleFloatingPanel() {
+        guard let window else {
+            SentryDebug.captureNoWindow()
+            return
+        }
+
+        guard let rootViewController = window.rootViewController else {
+            return
+        }
+
+        let upsaleFloatingPanelController = UpsaleViewController
+            .instantiateInFloatingPanel(rootViewController: rootViewController)
+        rootViewController.present(upsaleFloatingPanelController, animated: true)
+    }
+
     @MainActor public func showUpdateRequired() {
         guard let window else {
             SentryDebug.captureNoWindow()

kDrive/UI/Controller/Files/File List/FileListViewController.swift

@@ -296,26 +296,8 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
 
         guard accountManager.currentAccount != nil else {
             #if !ISEXTENSION
-            let upsaleViewController = UpsaleViewController()
-
-            upsaleViewController.onFreeTrialCompleted = { [weak self] in
-                guard let self else { return }
-                self.dismiss(animated: true) {
-                    let loginDelegateHandler = LoginDelegateHandler()
-                    self.router.showRegister(delegate: loginDelegateHandler)
-                }
-            }
-
-            upsaleViewController.onLoginCompleted = { [weak self] in
-                guard let self else { return }
-                self.dismiss(animated: true) {
-                    let loginDelegateHandler = LoginDelegateHandler()
-                    self.router.showLogin(delegate: loginDelegateHandler)
-                }
-            }
-
-            let floatingPanel = UpsaleFloatingPanelController(upsaleViewController: upsaleViewController)
-            present(floatingPanel, animated: true, completion: nil)
+            let upsaleFloatingPanelController = UpsaleViewController.instantiateInFloatingPanel(rootViewController: self)
+            present(upsaleFloatingPanelController, animated: true, completion: nil)
             #else
             dismiss(animated: true)
             #endif
@@ -656,7 +638,6 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
 
     func toggleMultipleSelection(_ on: Bool) {
         if on {
-            addToKDriveButton.isHidden = true
             navigationItem.title = nil
             headerView?.selectView.isHidden = false
             headerView?.selectView.setActions(viewModel.multipleSelectionViewModel?.multipleSelectionActions ?? [])
@@ -666,7 +647,6 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
             generator.prepare()
             generator.impactOccurred()
         } else {
-            addToKDriveButton.isHidden = false
             headerView?.selectView.isHidden = true
             collectionView.allowsMultipleSelection = false
             navigationController?.navigationBar.prefersLargeTitles = true

kDrive/UI/Controller/Files/FileActionsFloatingPanelViewController+Actions.swift

@@ -165,6 +165,8 @@ extension FileActionsFloatingPanelViewController {
             leaveShareAction()
         case .cancelImport:
             cancelImportAction()
+        case .addToMyDrive:
+            addToMyDrive()
         default:
             break
         }
@@ -520,4 +522,30 @@ extension FileActionsFloatingPanelViewController {
             }
         }
     }
+
+    private func addToMyDrive() {
+        guard accountManager.currentAccount != nil else {
+            router.showUpsaleFloatingPanel()
+            return
+        }
+
+        guard let currentUserDriveFileManager = accountManager.currentDriveFileManager,
+              let publicShareProxy = driveFileManager.publicShareProxy else {
+            return
+        }
+
+        PublicShareAction().addToMyDrive(
+            publicShareProxy: publicShareProxy,
+            currentUserDriveFileManager: currentUserDriveFileManager,
+            selectedItemsIds: [file.id],
+            exceptItemIds: [],
+            onPresentViewController: { saveNavigationViewController, animated in
+                self.present(saveNavigationViewController, animated: animated, completion: nil)
+            },
+            onDismissViewController: { [weak self] in
+                guard let self else { return }
+                self.dismiss(animated: true)
+            }
+        )
+    }
 }

kDrive/UI/Controller/Files/FloatingPanelAction.swift

@@ -52,6 +52,7 @@ public class FloatingPanelAction: Equatable {
         case shareAndRights
         case shareLink
         case upsaleColor
+        case addToMyDrive
     }
 
     init(
@@ -188,6 +189,11 @@ public class FloatingPanelAction: Equatable {
         name: KDriveResourcesStrings.Localizable.buttonChangeFolderColor,
         image: KDriveResourcesAsset.colorBucket.image
     )
+    static let addToMyDrive = FloatingPanelAction(
+        id: .addToMyDrive,
+        name: KDriveResourcesStrings.Localizable.buttonAddToKDrive,
+        image: KDriveResourcesAsset.drive.image
+    )
 
     static var listActions: [FloatingPanelAction] {
         return [
@@ -226,7 +232,7 @@ public class FloatingPanelAction: Equatable {
     }
 
     static var publicShareActions: [FloatingPanelAction] {
-        return [openWith, sendCopy, download].map { $0.reset() }
+        return [openWith, sendCopy, download, addToMyDrive].map { $0.reset() }
     }
 
     static var publicShareFolderActions: [FloatingPanelAction] {

kDrive/UI/Controller/Files/PublicShareAction.swift

@@ -0,0 +1,41 @@
+/*
+ Infomaniak kDrive - iOS App
+ Copyright (C) 2024 Infomaniak Network SA
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import kDriveCore
+import UIKit
+
+struct PublicShareAction {
+    @MainActor func addToMyDrive(
+        publicShareProxy: PublicShareProxy,
+        currentUserDriveFileManager: DriveFileManager,
+        selectedItemsIds: [Int],
+        exceptItemIds: [Int],
+        onPresentViewController: (UIViewController, Bool) -> Void,
+        onDismissViewController: (() -> Void)?
+    ) {
+        let saveNavigationViewController = SaveFileViewController.instantiateInNavigationController(
+            driveFileManager: currentUserDriveFileManager,
+            publicShareProxy: publicShareProxy,
+            publicShareFileIds: selectedItemsIds,
+            publicShareExceptIds: exceptItemIds,
+            onDismissViewController: onDismissViewController
+        )
+
+        onPresentViewController(saveNavigationViewController, true)
+    }
+}

kDrive/UI/Controller/Files/Save File/SaveFileViewController+FooterButtonDelegate.swift

@@ -30,8 +30,6 @@ extension SaveFileViewController: FooterButtonDelegate {
             return
         }
         let drive = selectedDriveFileManager.drive
-
-        // Making sure the user cannot spam the button on tasks that may take a while
         let button = sender as? IKLargeButton
         button?.setLoading(true)
 

kDrive/UI/Controller/Files/Save File/SaveFileViewController.swift

@@ -350,20 +350,34 @@ class SaveFileViewController: UIViewController {
         return viewController
     }
 
-    class func setInNavigationController(saveViewController: SaveFileViewController,
-                                         files: [ImportedFile]? = nil) -> TitleSizeAdjustingNavigationController {
-        if let files {
-            saveViewController.items = files
-        }
-        let navigationController = TitleSizeAdjustingNavigationController(rootViewController: saveViewController)
-        navigationController.navigationBar.prefersLargeTitles = true
-        return navigationController
+    class func instantiateInNavigationController(driveFileManager: DriveFileManager,
+                                                 publicShareProxy: PublicShareProxy,
+                                                 publicShareFileIds: [Int],
+                                                 publicShareExceptIds: [Int],
+                                                 onDismissViewController: (() -> Void)?)
+        -> TitleSizeAdjustingNavigationController {
+        let saveViewController = instantiate(driveFileManager: driveFileManager)
+
+        saveViewController.publicShareFileIds = publicShareFileIds
+        saveViewController.publicShareExceptIds = publicShareExceptIds
+        saveViewController.publicShareProxy = publicShareProxy
+
+        return wrapInNavigationController(saveViewController)
     }
 
     class func instantiateInNavigationController(driveFileManager: DriveFileManager?,
                                                  files: [ImportedFile]? = nil) -> TitleSizeAdjustingNavigationController {
         let saveViewController = instantiate(driveFileManager: driveFileManager)
-        return setInNavigationController(saveViewController: saveViewController,
-                                         files: files)
+        if let files {
+            saveViewController.items = files
+        }
+
+        return wrapInNavigationController(saveViewController)
+    }
+
+    private class func wrapInNavigationController(_ viewController: UIViewController) -> TitleSizeAdjustingNavigationController {
+        let navigationController = TitleSizeAdjustingNavigationController(rootViewController: viewController)
+        navigationController.navigationBar.prefersLargeTitles = true
+        return navigationController
     }
 }

kDrive/UI/Controller/Menu/Share/PublicShareViewModel.swift

@@ -25,6 +25,7 @@ import UIKit
 /// Public share view model, loading content from memory realm
 final class PublicShareViewModel: InMemoryFileListViewModel {
     @LazyInjectService private var accountManager: AccountManageable
+    @LazyInjectService private var router: AppNavigable
 
     private var downloadObserver: ObservationToken?
 
@@ -148,29 +149,35 @@ final class PublicShareViewModel: InMemoryFileListViewModel {
     }
 
     private func addToMyDrive(sender: Any?, publicShareProxy: PublicShareProxy) {
+        guard accountManager.currentAccount != nil else {
+            router.showUpsaleFloatingPanel()
+            return
+        }
+
         guard let currentUserDriveFileManager = accountManager.currentDriveFileManager else {
             return
         }
 
-        let selectedItemsIds = multipleSelectionViewModel?.selectedItems.map(\.id) ?? [] + [rootProxy.id]
+        var selectedItemsIds = multipleSelectionViewModel?.selectedItems.map(\.id) ?? []
         let exceptItemIds = multipleSelectionViewModel?.exceptItemIds.map { $0 } ?? []
 
-        let saveViewController = SaveFileViewController.instantiate(driveFileManager: currentUserDriveFileManager)
-        let saveNavigationViewController = SaveFileViewController
-            .setInNavigationController(saveViewController: saveViewController)
-
-        saveViewController.onDismissViewController = { [weak self] in
-            guard let self else { return }
-            self.onDismissViewController?()
+        if publicShareProxy.fileId != rootProxy.id, selectedItemsIds.isEmpty {
+            selectedItemsIds += [rootProxy.id]
         }
 
-        if let saveViewController = saveNavigationViewController.viewControllers.first as? SaveFileViewController {
-            saveViewController.publicShareFileIds = selectedItemsIds
-            saveViewController.publicShareExceptIds = exceptItemIds
-            saveViewController.publicShareProxy = publicShareProxy
-            saveViewController.selectedDirectory = currentDirectory
-        }
-
-        onPresentViewController?(.modal, saveNavigationViewController, true)
+        PublicShareAction().addToMyDrive(
+            publicShareProxy: publicShareProxy,
+            currentUserDriveFileManager: currentUserDriveFileManager,
+            selectedItemsIds: selectedItemsIds,
+            exceptItemIds: exceptItemIds,
+            onPresentViewController: { saveNavigationViewController, animated in
+                onPresentViewController?(.modal, saveNavigationViewController, animated)
+            },
+            onDismissViewController: { [weak self] in
+                guard let self else { return }
+                self.onDismissViewController?()
+                self.multipleSelectionViewModel?.isMultipleSelectionEnabled = false
+            }
+        )
     }
 }

kDrive/UI/View/Upsale/UpsaleViewController.swift

@@ -17,6 +17,7 @@
  */
 
 import InfomaniakCoreUIKit
+import InfomaniakDI
 import kDriveCore
 import kDriveResources
 import UIKit
@@ -228,4 +229,28 @@ public class UpsaleViewController: UIViewController {
         dismiss(animated: true, completion: nil)
         onLoginCompleted?()
     }
+
+    public static func instantiateInFloatingPanel(rootViewController: UIViewController) -> UIViewController {
+        let upsaleViewController = UpsaleViewController()
+
+        upsaleViewController.onFreeTrialCompleted = { [weak rootViewController] in
+            guard let rootViewController else { return }
+            rootViewController.dismiss(animated: true) {
+                let loginDelegateHandler = LoginDelegateHandler()
+                @InjectService var router: AppNavigable
+                router.showRegister(delegate: loginDelegateHandler)
+            }
+        }
+
+        upsaleViewController.onLoginCompleted = { [weak rootViewController] in
+            guard let rootViewController else { return }
+            rootViewController.dismiss(animated: true) {
+                let loginDelegateHandler = LoginDelegateHandler()
+                @InjectService var router: AppNavigable
+                router.showLogin(delegate: loginDelegateHandler)
+            }
+        }
+
+        return UpsaleFloatingPanelController(upsaleViewController: upsaleViewController)
+    }
 }

kDriveCore/Utils/AppNavigable.swift

@@ -37,6 +37,8 @@ public protocol RouterAppNavigable {
 
     @MainActor func showLaunchFloatingPanel()
 
+    @MainActor func showUpsaleFloatingPanel()
+
     @MainActor func showUpdateRequired()
 
     @MainActor func showPhotoSyncSettings()

kDriveCore/Utils/MatomoUtils.swift

@@ -136,7 +136,7 @@ public enum MatomoUtils {
 
     // MARK: - Public Share
 
-    public static func trackAddToMykDrive() {
+    public static func trackAddToMyDrive() {
         track(eventWithCategory: .publicShareAction, name: "saveToKDrive")
     }
 

kDriveTestShared/MCKRouter.swift

@@ -18,6 +18,7 @@
 
 import Foundation
 import InfomaniakCore
+import InfomaniakLogin
 import kDrive
 import kDriveCore
 import UIKit
@@ -74,6 +75,10 @@ public final class MCKRouter: AppNavigable {
         logNoop()
     }
 
+    public func showUpsaleFloatingPanel() {
+        logNoop()
+    }
+
     public func showUpdateRequired() {
         logNoop()
     }
@@ -82,6 +87,14 @@ public final class MCKRouter: AppNavigable {
         logNoop()
     }
 
+    public func showLogin(delegate: InfomaniakLoginDelegate) {
+        logNoop()
+    }
+
+    public func showRegister(delegate: InfomaniakLoginDelegate) {
+        logNoop()
+    }
+
     public func present(file: kDriveCore.File, driveFileManager: kDriveCore.DriveFileManager) {
         logNoop()
     }

kDriveTests/kDrive/Launch/MockAccountManager.swift

@@ -93,7 +93,7 @@ class MockAccountManager: AccountManageable, RefreshTokenDelegate {
 
     func logoutCurrentAccountAndSwitchToNextIfPossible() { fatalError("Not implemented") }
 
-    func getInMemoryDriveFileManager(for publicShareId: String, driveId: Int, rootFileId: Int) -> DriveFileManager {
+    func getInMemoryDriveFileManager(for publicShareId: String, driveId: Int, rootFileId: Int) -> DriveFileManager? {
         fatalError("Not implemented")
     }
 }