fix e2ee

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>

iOSClient/Main/Collection Common/NCCollectionViewCommon.swift

@@ -554,7 +554,12 @@ class NCCollectionViewCommon: UIViewController, UIGestureRecognizerDelegate, UIS
               account == appDelegate.account
         else { return }
 
-        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else { return }
+        // do not exists metadata ?
+        guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else {
+            reloadDataSource()
+            return
+        }
+        
         if metadata.livePhoto && metadata.classFile == NKCommon.typeClassFile.video.rawValue { return }
         let (indexPath, sameSections) = dataSource.reloadMetadata(ocId: metadata.ocId, ocIdTemp: ocIdTemp)
         if let indexPath = indexPath {

iOSClient/Networking/NCNetworking.swift

@@ -399,24 +399,20 @@ import Photos
 
         if metadata.e2eEncrypted {
             #if !EXTENSION_FILE_PROVIDER_EXTENSION && !EXTENSION_WIDGET
-            DispatchQueue.global().asyncAfter(deadline: .now() + 1) {
-                NCNetworkingE2EE.shared.upload(metadata: metadata, start: start) { error in
-                    completion(error)
-                }
+            NCNetworkingE2EE.shared.upload(metadata: metadata, start: start) { error in
+                completion(error)
             }
             #endif
         } else if metadata.chunk {
-            DispatchQueue.global().asyncAfter(deadline: .now() + 1) {
-                self.uploadChunkedFile(metadata: metadata, start: start) { error in
-                    completion(error)
-                }
+            uploadChunkedFile(metadata: metadata, start: start) { error in
+                completion(error)
             }
         } else if metadata.session == NKCommon.shared.sessionIdentifierUpload {
             uploadFile(metadata: metadata, start: start) { error in
                 completion(error)
             }
         } else {
-            self.uploadFileInBackground(metadata: metadata, start: start) { error in
+            uploadFileInBackground(metadata: metadata, start: start) { error in
                 completion(error)
             }
         }

iOSClient/Networking/NCNetworkingE2EE.swift

@@ -290,43 +290,43 @@ import Alamofire
 
                 }) { account, ocId, etag, date, _, _, afError, error in
 
-                    NCNetworking.shared.uploadRequest.removeValue(forKey: fileNameLocalPath)
-                    if let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) {
-                        if afError?.isExplicitlyCancelledError ?? false {
+                    NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: serverUrl) { _, _, errorLock in
 
-                            CCUtility.removeFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId))
-                            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
-                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": error])
-                            completion(NKError())
+                        NCNetworking.shared.uploadRequest.removeValue(forKey: fileNameLocalPath)
+                        if let metadata = NCManageDatabase.shared.getMetadataFromOcId(metadata.ocId) {
+                            if afError?.isExplicitlyCancelledError ?? false {
 
-                        } else if error == .success && ocId != nil {
+                                CCUtility.removeFile(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId))
+                                NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", metadata.ocId))
+                                NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": error])
 
-                            NCUtilityFileSystem.shared.moveFileInBackground(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId), toPath: CCUtility.getDirectoryProviderStorageOcId(ocId))
+                            } else if error == .success && ocId != nil {
 
-                            metadata.date = date ?? NSDate()
-                            metadata.etag = etag ?? ""
-                            metadata.ocId = ocId!
+                                NCUtilityFileSystem.shared.moveFileInBackground(atPath: CCUtility.getDirectoryProviderStorageOcId(metadata.ocId), toPath: CCUtility.getDirectoryProviderStorageOcId(ocId))
 
-                            metadata.session = ""
-                            metadata.sessionError = ""
-                            metadata.sessionTaskIdentifier = 0
-                            metadata.status = NCGlobal.shared.metadataStatusNormal
+                                metadata.date = date ?? NSDate()
+                                metadata.etag = etag ?? ""
+                                metadata.ocId = ocId!
 
-                            NCManageDatabase.shared.addMetadata(metadata)
-                            NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
-                            NCManageDatabase.shared.addLocalFile(metadata: metadata)
+                                metadata.session = ""
+                                metadata.sessionError = ""
+                                metadata.sessionTaskIdentifier = 0
+                                metadata.status = NCGlobal.shared.metadataStatusNormal
 
-                            NCUtility.shared.createImageFrom(fileNameView: metadata.fileNameView, ocId: metadata.ocId, etag: metadata.etag, classFile: metadata.classFile)
-                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": error])
+                                NCManageDatabase.shared.addMetadata(metadata)
+                                NCManageDatabase.shared.deleteMetadata(predicate: NSPredicate(format: "ocId == %@", ocIdTemp))
+                                NCManageDatabase.shared.addLocalFile(metadata: metadata)
 
-                        } else {
+                                NCUtility.shared.createImageFrom(fileNameView: metadata.fileNameView, ocId: metadata.ocId, etag: metadata.etag, classFile: metadata.classFile)
+                                NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": error])
+
+                            } else {
 
-                            NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: error.errorDescription, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError)
+                                NCManageDatabase.shared.setMetadataSession(ocId: metadata.ocId, session: nil, sessionError: error.errorDescription, sessionTaskIdentifier: 0, status: NCGlobal.shared.metadataStatusUploadError)
 
-                            NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": error])
+                                NotificationCenter.default.postOnMainThread(name: NCGlobal.shared.notificationCenterUploadedFile, userInfo: ["ocId": metadata.ocId, "serverUrl": metadata.serverUrl, "account": metadata.account, "fileName": metadata.fileName, "ocIdTemp": ocIdTemp, "error": error])
+                            }
                         }
-                    }
-                    NCNetworkingE2EE.shared.unlock(account: metadata.account, serverUrl: serverUrl) { _, _, _ in
                         completion(error)
                     }
                 }