Fix merge conflicts + fix spelling

Signed-off-by: Henrik Storch <henrik.storch@nextcloud.com>

iOSClient/Main/Collection Common/NCSelectableNavigationView.swift

@@ -107,7 +107,7 @@ extension NCSelectableNavigationView where Self: UIViewController {
         }
 
         actions.append(.moveOrCopyAction(selectedMetadatas: selectedMetadatas, completion: tapSelect))
-        actions.append(.copyAction(selectOcId: selectOcId, completion: tapSelect))
+        actions.append(.copyAction(selectOcId: selectOcId, hudView: self.view, completion: tapSelect))
         actions.append(.deleteAction(selectedMetadatas: selectedMetadatas, viewController: self, completion: tapSelect))
         return actions
     }

iOSClient/Main/NCFunctionCenter.swift

@@ -230,7 +230,7 @@ import JGProgressHUD
 
         for metadata in selectedMetadata {
             guard !metadata.directory else { continue }
-            if !CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
+            if !CCUtility.fileProviderStorageExists(metadata) {
                 let semaphore = Semaphore()
                 NCNetworking.shared.download(metadata: metadata, selector: "") { errorCode in
                     error = errorCode
@@ -427,7 +427,7 @@ import JGProgressHUD
 
             DispatchQueue.main.async(execute: hud.dismiss)
 
-            // do 5 downloads in paralell to optimize efficiancy
+            // do 5 downloads in parallel to optimize efficiency
             let parallelizer = ParallelWorker(n: 5, titleKey: "_downloading_", totalTasks: downloadMetadatas.count, hudView: hudView)
 
             for metadata in downloadMetadatas {

iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -252,7 +252,7 @@ extension NCCollectionViewCommon {
         // COPY
         //
         if !metadata.directory {
-            actions.append(.copyAction(selectOcId: [metadata.ocId]))
+            actions.append(.copyAction(selectOcId: [metadata.ocId], hudView: self.view))
         }
         
         /*

iOSClient/Menu/NCMedia+Menu.swift

@@ -169,7 +169,7 @@ extension NCMedia {
             //
             // COPY
             //
-            actions.append(.copyAction(selectOcId: selectOcId, completion: tapSelect))
+            actions.append(.copyAction(selectOcId: selectOcId, hudView: self.view, completion: tapSelect))
 
             //
             // DELETE

iOSClient/Menu/NCMenuAction.swift

@@ -7,6 +7,7 @@
 //
 
 import Foundation
+import UIKit
 
 class NCMenuAction {
     let title: String
@@ -37,7 +38,7 @@ class NCMenuAction {
     }
 }
 
-// MARK: - Actons
+// MARK: - Actions
 
 extension NCMenuAction {
 
@@ -51,12 +52,12 @@ extension NCMenuAction {
     }
 
     /// Copy files to pasteboard
-    static func copyAction(selectOcId: [String], completion: (() -> Void)? = nil) -> NCMenuAction {
+    static func copyAction(selectOcId: [String], hudView: UIView, completion: (() -> Void)? = nil) -> NCMenuAction {
         NCMenuAction(
             title: NSLocalizedString("_copy_file_", comment: ""),
             icon: NCUtility.shared.loadImage(named: "doc.on.doc"),
             action: { _ in
-                NCFunctionCenter.shared.copyPasteboard(pasteboardOcIds: selectOcId)
+                NCFunctionCenter.shared.copyPasteboard(pasteboardOcIds: selectOcId, hudView: hudView)
                 completion?()
             }
         )
@@ -117,7 +118,7 @@ extension NCMenuAction {
         )
     }
 
-    /// Open "share view" (activity VC) to open files iin another app
+    /// Open "share view" (activity VC) to open files in another app
     static func openInAction(selectedMetadatas: [tableMetadata], viewController: UIViewController, completion: (() -> Void)? = nil) -> NCMenuAction {
         NCMenuAction(
             title: NSLocalizedString("_open_in_", comment: ""),
@@ -135,7 +136,7 @@ extension NCMenuAction {
         )
     }
 
-    /// Save selected files to user's prohot library
+    /// Save selected files to user's photo library
     static func saveMediaAction(selectedMediaMetadatas: [tableMetadata], completion: (() -> Void)? = nil) -> NCMenuAction {
         var title: String = NSLocalizedString("_save_selected_files_", comment: "")
         var icon = NCUtility.shared.loadImage(named: "square.and.arrow.down")
@@ -152,7 +153,7 @@ extension NCMenuAction {
                     if let metadataMOV = NCManageDatabase.shared.getMetadataLivePhoto(metadata: metadata) {
                         NCFunctionCenter.shared.saveLivePhoto(metadata: metadata, metadataMOV: metadataMOV)
                     } else {
-                        if CCUtility.fileProviderStorageExists(metadata.ocId, fileNameView: metadata.fileNameView) {
+                        if CCUtility.fileProviderStorageExists(metadata) {
                             NCFunctionCenter.shared.saveAlbum(metadata: metadata)
                         } else {
                             NCOperationQueue.shared.download(metadata: metadata, selector: NCGlobal.shared.selectorSaveAlbum)

iOSClient/Menu/NCViewer+Menu.swift

@@ -197,7 +197,7 @@ extension NCViewer {
         //
         // COPY
         //
-        actions.append(.copyAction(selectOcId: [metadata.ocId]))
+        actions.append(.copyAction(selectOcId: [metadata.ocId], hudView: viewController.view))
 
         //
         // VIEW IN FOLDER