improvements API

iOSClient/Activity/NCActivity.swift

@@ -410,7 +410,7 @@ extension activityTableViewCell: UICollectionViewDelegate {
                         
                         if account == self.appDelegate.activeAccount && errorCode == 0 && files?.count ?? 0 > 0  {
                             
-                            let metadata = NCNetworking.sharedInstance.convertFile(files![0], urlString: self.appDelegate.activeUrl, serverUrl: serverUrl, user: self.appDelegate.activeUser)
+                            let metadata = NCNetworking.sharedInstance.convertFile(files![0])
                             metadata.fileName = fileName
                             metadata.fileNameView = fileName
                             

iOSClient/Favorites/CCFavorites.m

@@ -205,7 +205,7 @@
         
          if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
              
-             NSArray *metadatas = [[NCNetworking sharedInstance] convertFiles:files urlString:appDelegate.activeUrl serverUrl:nil user:appDelegate.activeUser metadataFolder:nil];
+             NSArray *metadatas = [[NCNetworking sharedInstance] convertFiles:files metadataFolder:nil];
              
              NSString *father = @"";
              NSMutableArray *filesOcId = [NSMutableArray new];

iOSClient/Main/CCMain.m

@@ -1285,7 +1285,7 @@
           
         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount] && files.count > 0) {
             
-            tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0] urlString:appDelegate.activeUrl serverUrl:self.serverUrl user:appDelegate.activeUser];
+            tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0]];
             
             // Rich Workspace
             [[NCManageDatabase sharedInstance] setDirectoryWithOcId:metadata.ocId serverUrl:self.serverUrl richWorkspace:metadata.richWorkspace account:account];
@@ -1471,7 +1471,7 @@
         
          if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
              
-              NSArray *metadatas = [[NCNetworking sharedInstance] convertFiles:files urlString:appDelegate.activeUrl serverUrl:nil user:appDelegate.activeUser metadataFolder:nil];
+              NSArray *metadatas = [[NCNetworking sharedInstance] convertFiles:files metadataFolder:nil];
              _searchResultMetadatas = [[NSMutableArray alloc] initWithArray:metadatas];
              [self insertMetadatasWithAccount:appDelegate.activeAccount serverUrl:_serverUrl metadataFolder:nil metadatas:_searchResultMetadatas];
                           

iOSClient/Media/NCMedia.swift

@@ -628,7 +628,7 @@ extension NCMedia {
                 
                 DispatchQueue.global().async {
                     
-                    let metadatas = NCNetworking.sharedInstance.convertFiles(files!, urlString: self.appDelegate.activeUrl, serverUrl: nil, user: self.appDelegate.activeUser, metadataFolder: nil)
+                    let metadatas = NCNetworking.sharedInstance.convertFiles(files!, metadataFolder: nil)
                 
                     var isDifferent: Bool = false
                     var newInsert: Int = 0

iOSClient/Networking/NCNetworking.swift

@@ -155,7 +155,7 @@ import NCCommunication
     
     //MARK: - File <> Metadata
     
-    @objc func convertFile(_ file: NCFile, urlString: String, serverUrl : String?, user: String) -> tableMetadata {
+    @objc func convertFile(_ file: NCFile) -> tableMetadata {
         
         let metadata = tableMetadata()
         
@@ -181,11 +181,6 @@ import NCCommunication
         metadata.quotaAvailableBytes = file.quotaAvailableBytes
         metadata.richWorkspace = file.richWorkspace
         metadata.resourceType = file.resourceType
-        if serverUrl == nil {
-            metadata.serverUrl = urlString + file.path.replacingOccurrences(of: "dav/files/"+user, with: "webdav").dropLast()
-        } else {
-            metadata.serverUrl = serverUrl!
-        }
         metadata.serverUrl = file.serverUrl
         metadata.size = file.size
                    
@@ -194,7 +189,7 @@ import NCCommunication
         return metadata
     }
     
-    @objc func convertFiles(_ files: [NCFile], urlString: String, serverUrl : String?, user: String, metadataFolder: UnsafeMutablePointer<tableMetadata>?) -> [tableMetadata] {
+    @objc func convertFiles(_ files: [NCFile], metadataFolder: UnsafeMutablePointer<tableMetadata>?) -> [tableMetadata] {
         
         var metadatas = [tableMetadata]()
         
@@ -226,11 +221,6 @@ import NCCommunication
             metadata.quotaAvailableBytes = file.quotaAvailableBytes
             metadata.richWorkspace = file.richWorkspace
             metadata.resourceType = file.resourceType
-            if serverUrl == nil {
-                metadata.serverUrl = urlString + file.path.replacingOccurrences(of: "dav/files/"+user, with: "webdav").dropLast()
-            } else {
-                metadata.serverUrl = serverUrl!
-            }
             metadata.serverUrl = file.serverUrl
             metadata.size = file.size
                         

iOSClient/RichWorkspace/NCViewerRichWorkspace.swift

@@ -59,7 +59,7 @@ import MarkdownKit
             
             if errorCode == 0 && account == self.appDelegate.activeAccount && files?.count ?? 0 > 0 {
                 
-                let metadata = NCNetworking.sharedInstance.convertFile(files![0], urlString: self.appDelegate.activeUrl, serverUrl: self.serverUrl, user: self.appDelegate.activeUser)
+                let metadata = NCNetworking.sharedInstance.convertFile(files![0])
                 NCManageDatabase.sharedInstance.setDirectory(ocId: metadata.ocId, serverUrl: metadata.serverUrl, richWorkspace: metadata.richWorkspace, account: account)
                 if self.richWorkspaceText != metadata.richWorkspace {
                     self.appDelegate.activeMain.richWorkspaceText = self.richWorkspaceText

iOSClient/Select/NCSelect.swift

@@ -809,7 +809,7 @@ extension NCSelect {
             if errorCode == 0 && account == self.appDelegate.activeAccount {
                 
                 // update etag
-                self.metadataFolder = NCNetworking.sharedInstance.convertFile(files![0], urlString: self.appDelegate.activeUrl, serverUrl: self.serverUrl, user: self.appDelegate.activeUser)
+                self.metadataFolder = NCNetworking.sharedInstance.convertFile(files![0])
                 
                 NCManageDatabase.sharedInstance.setDirectory(serverUrl: self.serverUrl, serverUrlTo: nil, etag: self.metadataFolder!.etag, ocId: self.metadataFolder!.ocId, encrypted: self.metadataFolder!.e2eEncrypted, richWorkspace: self.metadataFolder!.richWorkspace, account: account)
                 

iOSClient/Shares/NCShares.m

@@ -298,7 +298,7 @@
                
         [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:serverUrlFileName depth:@"0" account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray*files, NSInteger errorCode, NSString *errorDescription) {        
             if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
-                tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0] urlString:appDelegate.activeUrl serverUrl:table.serverUrl user:appDelegate.activeUser];
+                tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0]];
                 metadata.fileName = table.fileName;
                 metadata.fileNameView = table.fileName;
                 [[NCManageDatabase sharedInstance] addMetadata:metadata];

iOSClient/Synchronize/CCSynchronize.m

@@ -224,7 +224,7 @@
                     withDownload = YES;
                 
                 //Add/Update Metadata
-                tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0] urlString:appDelegate.activeUrl serverUrl:nil user:appDelegate.activeUser];
+                tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0]];
                 metadata.fileName = fileName;
                 metadata.fileNameView = fileName;