coding

Signed-off-by: marinofaggiana <ios@nextcloud.com>

iOSClient/Main/Create cloud/NCCreateFormUploadConflict.swift

@@ -397,7 +397,7 @@ extension NCCreateFormUploadConflict: UITableViewDataSource {
                 } else {
 
                     // PREVIEW
-                    NCUtility.shared.extractImageVideoFromAssetLocalIdentifier(metadata: metadataNewFile, modifyMetadataForUpload: false, queue: .main) { metadata, fileNamePath, error in
+                    NCUtility.shared.extractImageVideoFromAssetLocalIdentifier(metadata: metadataNewFile, modifyMetadataForUpload: false) { metadata, fileNamePath, error in
                         if !error {
                             self.fileNamesPath[metadataNewFile.fileNameView] = fileNamePath!
                             do {

iOSClient/Networking/NCNetworkingProcessUpload.swift

@@ -106,7 +106,7 @@ class NCNetworkingProcessUpload: NSObject {
                         }
 
                         let semaphore = Semaphore()
-                        self.extractFiles(from: metadata, queue: queue) { metadatas in
+                        self.extractFiles(from: metadata) { metadatas in
                             if metadatas.isEmpty {
                                 NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
                             }
@@ -179,13 +179,13 @@ class NCNetworkingProcessUpload: NSObject {
 
     // MARK: -
 
-    func extractFiles(from metadata: tableMetadata, queue: DispatchQueue, completition: @escaping (_ metadatas: [tableMetadata]) -> Void) {
+    func extractFiles(from metadata: tableMetadata, completition: @escaping (_ metadatas: [tableMetadata]) -> Void) {
 
         let chunckSize = CCUtility.getChunkSize() * 1000000
         var metadatas: [tableMetadata] = []
         let metadataSource = tableMetadata.init(value: metadata)
 
-        guard !metadata.isExtractFile else { return queue.async { completition([metadataSource]) }}
+        guard !metadata.isExtractFile else { return  completition([metadataSource]) }
         guard !metadataSource.assetLocalIdentifier.isEmpty else {
             let filePath = CCUtility.getDirectoryProviderStorageOcId(metadataSource.ocId, fileNameView: metadataSource.fileName)!
             metadataSource.size = NCUtilityFileSystem.shared.getFileSize(filePath: filePath)
@@ -208,27 +208,27 @@ class NCNetworkingProcessUpload: NSObject {
             if let metadata = NCManageDatabase.shared.addMetadata(metadataSource) {
                 metadatas.append(metadata)
             }
-            return queue.async { completition(metadatas) }
+            return completition(metadatas)
         }
 
-        NCUtility.shared.extractImageVideoFromAssetLocalIdentifier(metadata: metadataSource, modifyMetadataForUpload: true, queue: queue) { metadata, fileNamePath, returnError in
+        NCUtility.shared.extractImageVideoFromAssetLocalIdentifier(metadata: metadataSource, modifyMetadataForUpload: true) { metadata, fileNamePath, returnError in
             if let metadata = metadata, let fileNamePath = fileNamePath, !returnError {
                 metadatas.append(metadata)
                 let toPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
                 NCUtilityFileSystem.shared.moveFile(atPath: fileNamePath, toPath: toPath)
             } else {
-                return queue.async { completition(metadatas) }
+                return completition(metadatas)
             }
             let fetchAssets = PHAsset.fetchAssets(withLocalIdentifiers: [metadataSource.assetLocalIdentifier], options: nil)
             if metadataSource.livePhoto, fetchAssets.count > 0  {
-                NCUtility.shared.createMetadataLivePhotoFromMetadata(metadataSource, asset: fetchAssets.firstObject, queue: queue) { metadata in
+                NCUtility.shared.createMetadataLivePhotoFromMetadata(metadataSource, asset: fetchAssets.firstObject) { metadata in
                     if let metadata = metadata, let metadata = NCManageDatabase.shared.addMetadata(metadata) {
                         metadatas.append(metadata)
                     }
-                    queue.async { completition(metadatas) }
+                    completition(metadatas)
                 }
             } else {
-                queue.async { completition(metadatas) }
+                completition(metadatas)
             }
         }
     }

iOSClient/Transfers/NCTransfers.swift

@@ -130,7 +130,7 @@ class NCTransfers: NCCollectionViewCommon, NCTransferCellDelegate {
         guard appDelegate.account == metadata.account else { return }
         guard let networkingProcessUpload = appDelegate.networkingProcessUpload else { return }
 
-        networkingProcessUpload.extractFiles(from: metadata, queue: DispatchQueue.global(qos: .background)) { metadatas in
+        networkingProcessUpload.extractFiles(from: metadata) { metadatas in
             for metadata in metadatas {
                 if let metadata = NCManageDatabase.shared.setMetadataStatus(ocId: metadata.ocId, status: NCGlobal.shared.metadataStatusInUpload) {
                     NCNetworking.shared.upload(metadata: metadata)

iOSClient/Utility/NCUtility.swift

@@ -400,7 +400,7 @@ class NCUtility: NSObject {
 
     // MARK: -
 
-    func extractImageVideoFromAssetLocalIdentifier(metadata: tableMetadata, modifyMetadataForUpload: Bool, queue: DispatchQueue, completion: @escaping (_ metadata: tableMetadata?, _ fileNamePath: String?, _ error: Bool) -> ()) {
+    func extractImageVideoFromAssetLocalIdentifier(metadata: tableMetadata, modifyMetadataForUpload: Bool, completion: @escaping (_ metadata: tableMetadata?, _ fileNamePath: String?, _ error: Bool) -> ()) {
 
         var fileNamePath: String?
         let metadata = tableMetadata.init(value: metadata)
@@ -409,7 +409,7 @@ class NCUtility: NSObject {
 
         func callCompletion(error: Bool) {
             if error {
-                queue.async { completion(nil, nil, true) }
+                completion(nil, nil, true)
             } else {
                 var metadataReturn = metadata
                 if modifyMetadataForUpload {
@@ -427,7 +427,7 @@ class NCUtility: NSObject {
                         metadataReturn = metadata
                     }
                 }
-                queue.async { completion(metadataReturn, fileNamePath, error) }
+                completion(metadataReturn, fileNamePath, error)
             }
         }
 
@@ -513,9 +513,9 @@ class NCUtility: NSObject {
         }
     }
 
-    func createMetadataLivePhotoFromMetadata(_ metadata: tableMetadata, asset: PHAsset?, queue: DispatchQueue, completion: @escaping (_ metadata: tableMetadata?) -> ()) {
+    func createMetadataLivePhotoFromMetadata(_ metadata: tableMetadata, asset: PHAsset?, completion: @escaping (_ metadata: tableMetadata?) -> ()) {
 
-        guard let asset = asset else { return queue.async { completion(nil) }}
+        guard let asset = asset else { return completion(nil) }
         let options = PHLivePhotoRequestOptions()
         options.deliveryMode = PHImageRequestOptionsDeliveryMode.fastFormat
         options.isNetworkAccessAllowed = true
@@ -525,7 +525,7 @@ class NCUtility: NSObject {
         let fileNamePath = CCUtility.getDirectoryProviderStorageOcId(ocId, fileNameView: fileName)!
 
         PHImageManager.default().requestLivePhoto(for: asset, targetSize: UIScreen.main.bounds.size, contentMode: PHImageContentMode.default, options: options) { livePhoto, info in
-            guard let livePhoto = livePhoto else { return queue.async { completion(nil) }}
+            guard let livePhoto = livePhoto else { return completion(nil) }
             var videoResource: PHAssetResource?
             for resource in PHAssetResource.assetResources(for: livePhoto) {
                 if resource.type == PHAssetResourceType.pairedVideo {
@@ -533,10 +533,10 @@ class NCUtility: NSObject {
                     break
                 }
             }
-            guard let videoResource = videoResource else { return queue.async { completion(nil) }}
+            guard let videoResource = videoResource else { return completion(nil) }
             NCUtilityFileSystem.shared.deleteFile(filePath: fileNamePath)
             PHAssetResourceManager.default().writeData(for: videoResource, toFile: URL(fileURLWithPath: fileNamePath), options: nil) { error in
-                if error != nil { return queue.async { completion(nil) }}
+                if error != nil { return completion(nil) }
                 let metadataLivePhoto = NCManageDatabase.shared.createMetadata(account: metadata.account, user: metadata.user, userId: metadata.userId, fileName: fileName, fileNameView: fileName, ocId: ocId, serverUrl: metadata.serverUrl, urlBase: metadata.urlBase, url: "", contentType: "", isLivePhoto: true)
                 metadataLivePhoto.classFile = NCCommunicationCommon.typeClassFile.video.rawValue
                 metadataLivePhoto.e2eEncrypted = metadata.e2eEncrypted
@@ -550,7 +550,7 @@ class NCUtility: NSObject {
                     metadataLivePhoto.chunk = true
                     metadataLivePhoto.session = NCCommunicationCommon.shared.sessionIdentifierUpload
                 }
-                return queue.async { completion(NCManageDatabase.shared.addMetadata(metadataLivePhoto)) }
+                return completion(NCManageDatabase.shared.addMetadata(metadataLivePhoto))
             }
         }
     }