Merge pull request #535 from PermanentOrg/feature/VSP-1635-IOS-Mobile-Old-Share-management-option-needs-to-be-replaced-for-private-workspace

VSP-1635[IOS][Mobile] Old Share management option needs to be replaced for private workspace

Author: luciancerbu-vsp

Permanent/Common/Files/ViewModel/FilesViewModel.swift

@@ -354,25 +354,6 @@ class FilesViewModel: NSObject, ViewModelInterface {
             }
         )}
 
-    func download(file: FileModel, onDownloadStart: @escaping VoidAction, onFileDownloaded: @escaping DownloadResponse) {
-        let downloadInfo = FileDownloadInfoVM(
-            fileType: file.type,
-            folderLinkId: file.folderLinkId,
-            parentFolderLinkId: file.parentFolderLinkId
-        )
-        
-        downloader = DownloadManagerGCD()
-        downloader?.download(
-            downloadInfo,
-            onDownloadStart: onDownloadStart,
-            onFileDownloaded: onFileDownloaded,
-            progressHandler: nil,
-            completion: {
-                self.downloader = nil
-                self.downloadQueue.safeRemoveFirst()
-            }
-        )}
-
     func delete(_ files: [FileModel]?, then handler: @escaping ServerResponse) {
         guard let files = files else {
             handler(.error(message: .errorMessage))

Permanent/Common/Managers/Download/DownloadManagerGCD.swift

@@ -17,7 +17,7 @@ class DownloadManagerGCD: Downloader {
     }
 
     func fileVO(forRecordVO recordVO: RecordVO, fileType: FileType) -> FileVO? {
-        if fileType == .video,
+        if fileType == .video || fileType == .image,
            let fileVO = recordVO.recordVO?.fileVOS?.first(where: {$0.format == "file.format.converted"}) {
             return fileVO
         } else {
@@ -152,13 +152,29 @@ class DownloadManagerGCD: Downloader {
             return handler(nil, APIError.invalidResponse)
         }
 
-        // If the file was converted, then it most certainly is an mp4
-        // Otherwise, the file was not converted, we use the original filename + extension
         let fileName: String
         if fileType == .video && fileVO.contentType == "video/mp4" {
             fileName = displayName + ".mp4"
         } else {
-            fileName = uploadFileName
+            var fileExtension = (uploadFileName as NSString).pathExtension
+            
+            if fileVO.format == "file.format.converted" {
+                if let contentType = fileVO.contentType {
+                    if contentType.contains("jpeg") {
+                        fileExtension = "JPG"
+                    } else if contentType.contains("png") {
+                        fileExtension = "PNG"
+                    } else if contentType.contains("heic") {
+                        fileExtension = "HEIC"
+                    }
+                }
+            }
+            
+            if !fileExtension.isEmpty {
+                fileName = displayName + "." + fileExtension
+            } else {
+                fileName = displayName
+            }
         }
 
         let apiOperation = APIOperation(FilesEndpoint.download(url: url, filename: fileName, progressHandler: progressHandler))

Permanent/Common/Network/Layer/APIRequestDispatcher.swift

@@ -61,17 +61,19 @@ class APIRequestDispatcher: RequestDispatcherProtocol {
 
         NetworkLogger.log(request: urlRequest)
 
+        let shouldIgnoreErrors = request.ignoreErrors
+        
         // Create a URLSessionTask to execute the URLRequest.
         var task: URLSessionTask?
         switch request.requestType {
         case .data:
             task = networkSession.dataTask(with: urlRequest, completionHandler: { data, urlResponse, error in
-                self.handleJsonTaskResponse(data: data, urlResponse: urlResponse, error: error, completion: completion)
+                self.handleJsonTaskResponse(data: data, urlResponse: urlResponse, error: error, ignoreErrors: shouldIgnoreErrors, completion: completion)
             })
 
         case .upload:
             task = networkSession.uploadTask(with: urlRequest, progressHandler: request.progressHandler, completion: { data, urlResponse, error in
-                self.handleJsonTaskResponse(data: data, urlResponse: urlResponse, error: error, completion: completion)
+                self.handleJsonTaskResponse(data: data, urlResponse: urlResponse, error: error, ignoreErrors: shouldIgnoreErrors, completion: completion)
             })
 
         case .download:
@@ -99,8 +101,9 @@ class APIRequestDispatcher: RequestDispatcherProtocol {
     ///   - data: The `Data` instance to be serialized into a JSON object.
     ///   - urlResponse: The received  optional `URLResponse` instance.
     ///   - error: The received  optional `Error` instance.
+    ///   - ignoreErrors: If true, errors will be silently ignored without triggering session expiration
     ///   - completion: Completion handler.
-    private func handleJsonTaskResponse(data: Data?, urlResponse: URLResponse?, error: Error?, completion: @escaping (OperationResult) -> Void) {
+    private func handleJsonTaskResponse(data: Data?, urlResponse: URLResponse?, error: Error?, ignoreErrors: Bool, completion: @escaping (OperationResult) -> Void) {
         // Check for errors
         if let apiError = APIError.error(withCode: (error as NSError?)?.code) {
             return completion(.error(apiError, nil))
@@ -113,6 +116,8 @@ class APIRequestDispatcher: RequestDispatcherProtocol {
         }
         NetworkLogger.log(response: urlResponse, data: data, error: error)
 
+        let shouldIgnoreAuthErrors = ignoreErrors || isNonCriticalEndpoint(urlResponse)
+        
         // Verify the HTTP status code.
         let result = verify(data: data, urlResponse: urlResponse, error: error)
         switch result {
@@ -124,7 +129,7 @@ class APIRequestDispatcher: RequestDispatcherProtocol {
                 if let mfaError = json as? [String: Any],
                 let results = mfaError["Results"] as? [[String: Any]],
                 let message = (results[0]["message"] as? [String])?.first,
-                (message == "warning.auth.mfaToken" && !ignoresMFAWarning) {
+                (message == "warning.auth.mfaToken" && !ignoresMFAWarning && !shouldIgnoreAuthErrors) {
                     DispatchQueue.main.async {
                         NotificationCenter.default.post(name: Self.sessionExpiredNotificationName, object: self)
                     }
@@ -137,7 +142,7 @@ class APIRequestDispatcher: RequestDispatcherProtocol {
             }
 
         case .failure(let error):
-            if error as? APIError == APIError.unauthorized {
+            if error as? APIError == APIError.unauthorized && !shouldIgnoreAuthErrors {
                 completion(OperationResult.error(error, urlResponse))
 
                 DispatchQueue.main.async {
@@ -241,4 +246,18 @@ class APIRequestDispatcher: RequestDispatcherProtocol {
         default: return nil
         }
     }
+    
+    private func isNonCriticalEndpoint(_ urlResponse: HTTPURLResponse) -> Bool {
+        guard let url = urlResponse.url?.absoluteString else { return false }
+        
+        if url.contains("/api/v2/event") && !url.contains("/checklist") {
+            return true
+        }
+        
+        if url.contains("/api/v2/share-links") {
+            return true
+        }
+        
+        return false
+    }
 }

Permanent/Common/Network/Layer/RequestProtocol.swift

@@ -62,6 +62,7 @@ protocol RequestProtocol {
     var bodyData: Data? { get }
 
     var customURL: String? { get }
+    var ignoreErrors: Bool { get }
 }
 
 extension RequestProtocol {
@@ -142,4 +143,8 @@ extension RequestProtocol {
             return nil
         }
     }
+    
+    var ignoreErrors: Bool {
+        return false
+    }
 }

Permanent/Modules/FileOperations/ViewController/FileDetailsViewController.swift

@@ -6,6 +6,7 @@
 //
 
 import UIKit
+import SwiftUI
 
 class FileDetailsViewController: BaseViewController<FilePreviewViewModel> {
     override var supportedInterfaceOrientations: UIInterfaceOrientationMask {
@@ -112,24 +113,84 @@ class FileDetailsViewController: BaseViewController<FilePreviewViewModel> {
     }
 
     @objc func showShareMenu(_ sender: Any) {
-        var menuItems: [FileMenuViewController.MenuItem] = []
+        var menuItems: [FileMenuViewModel.MenuItem] = []
 
-        menuItems.append(FileMenuViewController.MenuItem(type: .shareToAnotherApp, action: { [self] in
-            shareWithOtherApps()
-        }))
+        // Share to Permanent - only for files with ownership
+        if file.permissions.contains(.ownership) {
+            menuItems.append(FileMenuViewModel.MenuItem(type: .shareToPermanent, action: nil))
+        }
+        
+        // Share to another app - for files with share permission (not folders)
+        if file.permissions.contains(.share) && file.type.isFolder == false {
+            menuItems.append(FileMenuViewModel.MenuItem(type: .shareToAnotherApp, action: { [self] in
+                shareWithOtherApps()
+            }))
+        }
+        
+        // Publish on the web - for files with delete permission
+        if file.permissions.contains(.delete) {
+            menuItems.append(FileMenuViewModel.MenuItem(type: .publish, action: { [self] in
+                publishAction()
+            }))
+        }
 
-        if let publicURL = viewModel?.publicURL {
-            menuItems.append(FileMenuViewController.MenuItem(type: .getLink, action: { [self] in
-                share(url: publicURL)
+        // Download - for files with read permission (not folders)
+        if file.permissions.contains(.read) && file.type.isFolder == false {
+            menuItems.append(FileMenuViewModel.MenuItem(type: .download, action: { [weak self] in
+                guard let self = self else { return }
+                // Store the file reference before dismissing
+                let fileToDownload = self.file!
+                
+                // First dismiss the menu
+                if let menuHostingController = self.presentedViewController {
+                    menuHostingController.dismiss(animated: true) {
+                        // Then dismiss the preview and notify delegate
+                        self.navigationController?.dismiss(animated: true) {
+                            // Use delegate to request download from MainViewController
+                            self.delegate?.filePreviewNavigationControllerRequestsDownload(self, file: fileToDownload)
+                        }
+                    }
+                }
             }))
-        } else if self.file.permissions.contains(.ownership) {
-            menuItems.append(FileMenuViewController.MenuItem(type: .shareToPermanent, action: nil))
         }
+        
+        let swiftUIView = FileMoreMenuView(
+            fileViewModel: file,
+            menuItems: menuItems,
+            onDismiss: { [weak self] in
+                // Only dismiss the menu overlay, not the details view
+                self?.presentedViewController?.dismiss(animated: true)
+            },
+            onShareManagementRequested: { [weak self] file in
+                // Don't dismiss the details view - just dismiss the menu and present share management on top
+                if let hostingController = self?.presentedViewController {
+                    hostingController.dismiss(animated: true) {
+                        self?.presentShareManagement(for: file)
+                    }
+                }
+            },
+            downloadHandler: nil
+        )
+        
+        let hostingController = UIHostingController(rootView: swiftUIView)
+        hostingController.modalPresentationStyle = UIModalPresentationStyle.overFullScreen
+        hostingController.modalTransitionStyle = UIModalTransitionStyle.crossDissolve
+        hostingController.view.backgroundColor = UIColor.clear
+        
+        present(hostingController, animated: true)
+    }
 
-        let vc = FileMenuViewController()
-        vc.fileViewModel = file
-        vc.menuItems = menuItems
-        present(vc, animated: true)
+    private func presentShareManagement(for file: FileModel) {
+        let shareContainerView = ShareContainerView(fileModel: file)
+        let hostingController = UIHostingController(rootView: shareContainerView)
+        hostingController.modalPresentationStyle = UIModalPresentationStyle.pageSheet
+        if #available(iOS 15.0, *) {
+            if let sheet = hostingController.sheetPresentationController {
+                sheet.detents = [.large()]
+                sheet.prefersGrabberVisible = true
+            }
+        }
+        present(hostingController, animated: true)
     }
 
     @objc func closeButtonAction(_ sender: Any) {
@@ -178,13 +239,16 @@ class FileDetailsViewController: BaseViewController<FilePreviewViewModel> {
     }
 
     private func share(url: URL) {
-        // For now, dismiss the menu in case another one opens so we avoid crash.
-        documentInteractionController.dismissMenu(animated: true)
+        let activityViewController = UIActivityViewController(activityItems: [url], applicationActivities: nil)
+        
+        // For iPad support
+        if let popover = activityViewController.popoverPresentationController {
+            popover.sourceView = view
+            popover.sourceRect = CGRect(x: view.bounds.midX, y: view.bounds.midY, width: 0, height: 0)
+            popover.permittedArrowDirections = []
+        }
 
-        documentInteractionController.url = url
-        documentInteractionController.uti = url.typeIdentifier ?? "public.data, public.content"
-        documentInteractionController.name = url.localizedName ?? url.lastPathComponent
-        documentInteractionController.presentOptionsMenu(from: .zero, in: view, animated: true)
+        present(activityViewController, animated: true)
     }
 
     private func segmentedControlChangedAction() -> ((FileDetailsMenuCollectionViewCell) -> Void) {
@@ -216,8 +280,11 @@ class FileDetailsViewController: BaseViewController<FilePreviewViewModel> {
     }
 
     func shareWithOtherApps() {
-        if let fileName = self.viewModel?.fileName(),
-            let localURL = fileHelper.url(forFileNamed: fileName) {
+        // Check for file using displayName + extension (matches DownloadManagerGCD naming)
+        let fileExtension = (file.uploadFileName as NSString).pathExtension
+        let fileName = !fileExtension.isEmpty ? "\(file.name).\(fileExtension)" : file.name
+        
+        if let localURL = fileHelper.url(forFileNamed: fileName) {
             share(url: localURL)
         } else {
             let preparingAlert = UIAlertController(title: "Preparing File..".localized(), message: nil, preferredStyle: .alert)
@@ -240,6 +307,70 @@ class FileDetailsViewController: BaseViewController<FilePreviewViewModel> {
             }
         }
     }
+    
+    func publishAction() {
+        let title = String(format: "\(String.publish) \"%@\"?", file.name)
+        showActionDialog(
+            styled: .simpleWithDescription,
+            withTitle: title,
+            description: .publishDescription,
+            positiveButtonTitle: .publish,
+            positiveAction: { [weak self] in
+                self?.actionDialog?.dismiss()
+                self?.publish()
+            },
+            overlayView: nil
+        )
+    }
+    
+    private func publish() {
+        showSpinner()
+        
+        // Get the current archive number
+        guard let archiveNbr = AuthenticationManager.shared.session?.selectedArchive?.archiveNbr else {
+            hideSpinner()
+            showErrorAlert(message: "Unable to publish file")
+            return
+        }
+        
+        // First, get the public root folder
+        let filesRepository = FilesRepository()
+        filesRepository.getPublicRoot(archiveNbr: archiveNbr) { [weak self] (folder, error) in
+            guard let self = self else { return }
+            
+            if let error = error {
+                self.hideSpinner()
+                self.showErrorAlert(message: error.localizedDescription)
+                return
+            }
+            
+            guard let publicRootFolder = folder else {
+                self.hideSpinner()
+                self.showErrorAlert(message: "Unable to get public folder")
+                return
+            }
+            
+            // Now relocate (copy) the file to the public folder
+            filesRepository.relocate(
+                files: [self.file],
+                folderLinkId: publicRootFolder.folderLinkId,
+                isCopy: true
+            ) { error in
+                self.hideSpinner()
+                
+                if let error = error {
+                    self.showErrorAlert(message: error.localizedDescription)
+                } else {
+                    if self.file.type.isFolder {
+                        self.view.showNotificationBanner(height: Constants.Design.bannerHeight, title: "Folder published successfully".localized())
+                    } else {
+                        self.view.showNotificationBanner(height: Constants.Design.bannerHeight, title: "File published successfully".localized())
+                    }
+                }
+            }
+        }
+    }
+    
 }
 
 // MARK: - UICollectionViewDataSource

Permanent/Modules/FileOperations/ViewController/FilePreviewListViewController.swift

@@ -204,4 +204,9 @@ extension FilePreviewListViewController: FilePreviewNavigationControllerDelegate
             self.hasChanges = true
         }
     }
+    
+    func filePreviewNavigationControllerRequestsDownload(_ filePreviewNavigationVC: UIViewController, file: FileModel) {
+        // Forward the request through the navigation controller
+        (navigationController as? FilePreviewNavigationController)?.filePreviewNavDelegate?.filePreviewNavigationControllerRequestsDownload(self, file: file)
+    }
 }