feat: Add to my drive action

kDrive/AppDelegate.swift

@@ -107,11 +107,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
         Task {
             try! await Task.sleep(nanoseconds: 5_000_000_000)
 
-            @InjectService var router: AppNavigable
-            //let upsaleViewController = UpsaleViewController()
-            let noDriveViewController = NoDriveUpsaleViewController()
-            let floatingPanel = UpsaleFloatingPanelController(upsaleViewController: noDriveViewController)
-            router.topMostViewController?.present(floatingPanel, animated: true, completion: nil)
+//            @InjectService var router: AppNavigable
+//            //let upsaleViewController = UpsaleViewController()
+//            let noDriveViewController = NoDriveUpsaleViewController()
+//            let floatingPanel = UpsaleFloatingPanelController(upsaleViewController: noDriveViewController)
+//            router.topMostViewController?.present(floatingPanel, animated: true, completion: nil)
 
             /* Temp code to test out the feature. TODO: Remove later
                          // a public share expired
@@ -123,6 +123,11 @@ final class AppDelegate: UIResponder, UIApplicationDelegate {
 
                          await UniversalLinksHelper.handleURL(somePublicShare!)
               */
+
+            // a valid public share
+            let somePublicShare =
+                URL(string: "https://kdrive.infomaniak.com/app/share/140946/01953831-16d3-4df6-8b48-33c8001c7981")
+            await UniversalLinksHelper.handleURL(somePublicShare!)
         }
 
         return true

kDrive/AppRouter.swift

@@ -587,8 +587,7 @@ public struct AppRouter: AppNavigable {
 
     @MainActor public func presentPublicShareLocked(_ destinationURL: URL) {
         guard let window,
-              let rootViewController = window.rootViewController as? MainTabViewController else {
-            fatalError("TODO: fix offline routing - presentPublicShareLocked")
+              let rootViewController = window.rootViewController else {
             return
         }
 
@@ -599,20 +598,13 @@ public struct AppRouter: AppNavigable {
             publicShareNavigationController.modalPresentationStyle = .fullScreen
             publicShareNavigationController.modalTransitionStyle = .coverVertical
 
-            rootViewController.selectedIndex = MainTabBarIndex.files.rawValue
-
-            guard let navigationController = rootViewController.selectedViewController as? UINavigationController else {
-                return
-            }
-
-            navigationController.present(publicShareNavigationController, animated: true, completion: nil)
+            rootViewController.present(publicShareNavigationController, animated: true, completion: nil)
         }
     }
 
     @MainActor public func presentPublicShareExpired() {
         guard let window,
-              let rootViewController = window.rootViewController as? MainTabViewController else {
-            fatalError("TODO: fix offline routing - presentPublicShareExpired")
+              let rootViewController = window.rootViewController else {
             return
         }
 
@@ -622,13 +614,7 @@ public struct AppRouter: AppNavigable {
             publicShareNavigationController.modalPresentationStyle = .fullScreen
             publicShareNavigationController.modalTransitionStyle = .coverVertical
 
-            rootViewController.selectedIndex = MainTabBarIndex.files.rawValue
-
-            guard let navigationController = rootViewController.selectedViewController as? UINavigationController else {
-                return
-            }
-
-            navigationController.present(publicShareNavigationController, animated: true, completion: nil)
+            rootViewController.present(publicShareNavigationController, animated: true, completion: nil)
         }
     }
 
@@ -639,21 +625,18 @@ public struct AppRouter: AppNavigable {
         apiFetcher: PublicShareApiFetcher
     ) {
         guard let window,
-              let rootViewController = window.rootViewController as? MainTabViewController else {
-            fatalError("TODO: fix offline routing - presentPublicShare")
-            return
-        }
-
-        // TODO: Fix access right
-        guard !frozenRootFolder.isDisabled else {
-            fatalError("isDisabled")
+              let rootViewController = window.rootViewController else {
             return
         }
 
         rootViewController.dismiss(animated: false) {
-            rootViewController.selectedIndex = MainTabBarIndex.files.rawValue
-
-            guard let navigationController = rootViewController.selectedViewController as? UINavigationController else {
+            guard !frozenRootFolder.isDisabled else {
+                let noDriveViewController = NoDriveUpsaleViewController()
+                noDriveViewController.dismissCallback = {
+                    rootViewController.dismiss(animated: false) {}
+                }
+                let floatingPanel = UpsaleFloatingPanelController(upsaleViewController: noDriveViewController)
+                rootViewController.present(floatingPanel, animated: true, completion: nil)
                 return
             }
 
@@ -667,7 +650,7 @@ public struct AppRouter: AppNavigable {
             publicShareNavigationController.modalPresentationStyle = .fullScreen
             publicShareNavigationController.modalTransitionStyle = .coverVertical
 
-            navigationController.present(publicShareNavigationController, animated: true, completion: nil)
+            rootViewController.present(publicShareNavigationController, animated: true, completion: nil)
         }
     }
 

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

@@ -288,8 +288,40 @@ class FileListViewController: UICollectionViewController, SwipeActionCollectionV
         ])
     }
 
-    @objc func addToMyDriveButtonTapped(_ sender: UIView?) {
-        viewModel.barButtonPressed(sender: sender, type: .downloadAll)
+    @objc func addToMyDriveButtonTapped(_ sender: UIButton?) {
+        defer {
+            sender?.isSelected = false
+            sender?.isEnabled = true
+            sender?.isHighlighted = false
+        }
+
+        guard accountManager.currentAccount != nil else {
+            #if !ISEXTENSION
+            let upsaleViewController = UpsaleViewController()
+
+            // Create an account
+            upsaleViewController.freeTrialCallback = { [weak self] in
+                self?.dismiss(animated: true)
+                // TODO: Present login
+//                MatomoUtils.track(eventWithCategory: .account, name: "openCreationWebview")
+//                present(RegisterViewController.instantiateInNavigationController(delegate: self), animated: true)
+            }
+
+            // Let the user login with the onboarding
+            upsaleViewController.loginCallback = { [weak self] in
+                self?.dismiss(animated: true)
+            }
+
+            let floatingPanel = UpsaleFloatingPanelController(upsaleViewController: upsaleViewController)
+            present(floatingPanel, animated: true, completion: nil)
+            #else
+            dismiss(animated: true)
+            #endif
+
+            return
+        }
+
+        viewModel.barButtonPressed(sender: sender, type: .addToMyDrive)
     }
 
     func reloadCollectionViewWith(files: [File]) {

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

@@ -35,6 +35,7 @@ enum FileListBarButtonType {
     case photoSort
     case addFolder
     case downloadAll
+    case addToMyDrive
 }
 
 enum FileListQuickActionType {

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

@@ -36,18 +36,44 @@ extension SaveFileViewController: FooterButtonDelegate {
         let button = sender as? IKLargeButton
         button?.setLoading(true)
 
-        let items = items
-        guard !items.isEmpty else {
+        if let publicShareProxy {
+            Task {
+                try await savePublicShareToDrive(sourceDriveId: publicShareProxy.driveId,
+                                                 destinationDriveId: drive.accountId,
+                                                 fileIds: publicShareFileIds,
+                                                 exceptIds: publicShareExceptIds)
+            }
+        } else {
+            guard !items.isEmpty else {
+                dismiss(animated: true)
+                return
+            }
+
+            Task {
+                await saveAndDismiss(files: items, directory: directory, drive: drive)
+            }
+        }
+    }
+
+    private func savePublicShareToDrive(sourceDriveId: Int,
+                                        destinationDriveId: Int,
+                                        fileIds: [Int],
+                                        exceptIds: [Int]) async {
+        defer {
             dismiss(animated: true)
-            return
         }
 
-        Task {
-            await presentSnackBarSaveAndDismiss(files: items, directory: directory, drive: drive)
+        guard let currentDriveFileManager = accountManager.currentDriveFileManager else {
+            return
         }
+
+        try await currentDriveFileManager.apiFetcher.importShareLinkFiles(sourceDriveId: sourceDriveId,
+                                                                          destinationDriveId: destinationDriveId,
+                                                                          fileIds: fileIds,
+                                                                          exceptIds: exceptIds)
     }
 
-    private func presentSnackBarSaveAndDismiss(files: [ImportedFile], directory: File, drive: Drive) async {
+    private func saveAndDismiss(files: [ImportedFile], directory: File, drive: Drive) async {
         let message: String
         do {
             try await processForUpload(files: files, directory: directory, drive: drive)
@@ -59,6 +85,10 @@ extension SaveFileViewController: FooterButtonDelegate {
             message = error.localizedDescription
         }
 
+        presentSnackBar(message)
+    }
+
+    private func presentSnackBar(_ message: String) {
         Task { @MainActor in
             self.dismiss(animated: true, clean: false) {
                 UIConstants.showSnackBar(message: message)

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

@@ -0,0 +1,36 @@
+/*
+ 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 Foundation
+import kDriveCore
+
+// MARK: - SelectDriveDelegate
+
+extension SaveFileViewController: SelectDriveDelegate {
+    func didSelectDrive(_ drive: Drive) {
+        if let selectedDriveFileManager = accountManager.getDriveFileManager(for: drive.id, userId: drive.userId) {
+            self.selectedDriveFileManager = selectedDriveFileManager
+            selectedDirectory = getBestDirectory()
+            sections = [.fileName, .driveSelection, .directorySelection]
+            if itemProvidersContainHeicPhotos {
+                sections.append(.photoFormatOption)
+            }
+        }
+        updateButton()
+    }
+}

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

@@ -0,0 +1,34 @@
+/*
+ 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 Foundation
+import kDriveCore
+
+// MARK: - SelectFolderDelegate
+
+extension SaveFileViewController: SelectFolderDelegate {
+    func didSelectFolder(_ folder: File) {
+        if folder.id == DriveFileManager.constants.rootID {
+            selectedDirectory = selectedDriveFileManager?.getCachedRootFile()
+        } else {
+            selectedDirectory = folder
+        }
+        updateButton()
+        tableView.reloadData()
+    }
+}

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

@@ -0,0 +1,35 @@
+/*
+ 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 Foundation
+import kDriveCore
+
+// MARK: - SelectPhotoFormatDelegate
+
+extension SaveFileViewController: SelectPhotoFormatDelegate {
+    func didSelectPhotoFormat(_ format: PhotoFileFormat) {
+        if userPreferredPhotoFormat != format {
+            userPreferredPhotoFormat = format
+            if itemProviders?.isEmpty == false {
+                setItemProviders()
+            } else {
+                setAssetIdentifiers()
+            }
+        }
+    }
+}