normalized

iOSClient/Networking/NCNetworking.swift

@@ -380,7 +380,7 @@ import Queuer
                 NCNetworkingE2EE.shared.upload(metadata: tableMetadata.init(value: metadata), account: account, completion: completion)
                 #endif
             } else if metadata.chunk {
-                uploadChunkFile(metadata: tableMetadata.init(value: metadata), account: account, completion: completion)
+                uploadChunkFile(metadata: tableMetadata.init(value: metadata), userId: account.userId, completion: completion)
             } else if metadata.session == NCCommunicationCommon.shared.sessionIdentifierUpload {
                 uploadFile(metadata: tableMetadata.init(value: metadata), account: account, completion: completion)
             } else {
@@ -407,7 +407,7 @@ import Queuer
                     NCNetworkingE2EE.shared.upload(metadata: tableMetadata.init(value: extractMetadata), account: account, completion: completion)
                     #endif
                 } else if metadata.chunk {
-                    self.uploadChunkFile(metadata: tableMetadata.init(value: extractMetadata), account: account, completion: completion)
+                    self.uploadChunkFile(metadata: tableMetadata.init(value: extractMetadata), userId: account.userId, completion: completion)
                 } else if metadata.session == NCCommunicationCommon.shared.sessionIdentifierUpload {
                     self.uploadFile(metadata: tableMetadata.init(value: extractMetadata), account: account, completion: completion)
                 } else {

iOSClient/Networking/NCNetworkingChunkedUpload.swift

@@ -27,12 +27,12 @@ import Queuer
 
 extension NCNetworking {
     
-    internal func uploadChunkFile(metadata: tableMetadata, account: tableAccount, completion: @escaping (_ errorCode: Int, _ errorDescription: String)->()) {
+    internal func uploadChunkFile(metadata: tableMetadata, userId: String, completion: @escaping (_ errorCode: Int, _ errorDescription: String)->()) {
         
         let serverUrl = metadata.serverUrl
         let directoryProviderStorageOcId = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId)!
         let chunkFolder = NCManageDatabase.shared.getChunkFolder(account: metadata.account, ocId: metadata.ocId)
-        let chunkFolderPath = metadata.urlBase + "/" + NCUtilityFileSystem.shared.getDAV() + "/uploads/" + account.userId + "/" + chunkFolder
+        let chunkFolderPath = metadata.urlBase + "/" + NCUtilityFileSystem.shared.getDAV() + "/uploads/" + userId + "/" + chunkFolder
         let fileNameLocalPath = CCUtility.getDirectoryProviderStorageOcId(metadata.ocId, fileNameView: metadata.fileNameView)!
         var uploadErrorCode: Int = 0
         var uploadErrorDescription: String = ""
@@ -112,7 +112,7 @@ extension NCNetworking {
                             
                         let serverUrlFileNameSource = chunkFolderPath + "/.file"
                         let pathServerUrl = CCUtility.returnPathfromServerUrl(serverUrl, urlBase: metadata.urlBase, account: metadata.account)!
-                        let serverUrlFileNameDestination = metadata.urlBase + "/" + NCUtilityFileSystem.shared.getDAV() + "/files/" + account.userId + pathServerUrl + "/" + metadata.fileName
+                        let serverUrlFileNameDestination = metadata.urlBase + "/" + NCUtilityFileSystem.shared.getDAV() + "/files/" + userId + pathServerUrl + "/" + metadata.fileName
                         
                         var addCustomHeaders: [String:String] = [:]
                         let creationDate = "\(metadata.creationDate.timeIntervalSince1970)"