Improvements

iOSClient/Activity/NCActivity.swift

@@ -410,7 +410,9 @@ 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, fileName: fileName, user: self.appDelegate.activeUser)
+                            let metadata = NCNetworking.sharedInstance.convertFile(files![0], urlString: self.appDelegate.activeUrl, serverUrl: serverUrl, user: self.appDelegate.activeUser)
+                            metadata.fileName = fileName
+                            metadata.fileNameView = fileName
                             
                             // move from id to oc:id + instanceid (ocId)
                             

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 fileName:@"" user:appDelegate.activeUser];
+            tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0] urlString:appDelegate.activeUrl serverUrl:self.serverUrl user:appDelegate.activeUser];
             
             // Rich Workspace
             [[NCManageDatabase sharedInstance] setDirectoryWithOcId:metadata.ocId serverUrl:self.serverUrl richWorkspace:metadata.richWorkspace account:account];

iOSClient/Networking/NCNetworking.swift

@@ -155,7 +155,7 @@ import NCCommunication
     
     //MARK: - File <> Metadata
     
-    @objc func convertFile(_ file: NCFile, urlString: String, serverUrl : String?, fileName: String, user: String) -> tableMetadata {
+    @objc func convertFile(_ file: NCFile, urlString: String, serverUrl : String?, user: String) -> tableMetadata {
         
         let metadata = tableMetadata()
         
@@ -169,8 +169,8 @@ import NCCommunication
         metadata.etag = file.etag
         metadata.favorite = file.favorite
         metadata.fileId = file.fileId
-        metadata.fileName = fileName
-        metadata.fileNameView = fileName
+        metadata.fileName = file.fileName
+        metadata.fileNameView = file.fileName
         metadata.hasPreview = file.hasPreview
         metadata.mountType = file.mountType
         metadata.ocId = file.ocId
@@ -186,6 +186,7 @@ import NCCommunication
         } else {
             metadata.serverUrl = serverUrl!
         }
+        metadata.serverUrl = file.serverUrl
         metadata.size = file.size
                    
         CCUtility.insertTypeFileIconName(metadata.fileName, metadata: metadata)
@@ -230,6 +231,7 @@ import NCCommunication
             } else {
                 metadata.serverUrl = serverUrl!
             }
+            metadata.serverUrl = file.serverUrl
             metadata.size = file.size
                         
             CCUtility.insertTypeFileIconName(metadata.fileName, metadata: metadata)

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, fileName: "", user: self.appDelegate.activeUser)
+                let metadata = NCNetworking.sharedInstance.convertFile(files![0], urlString: self.appDelegate.activeUrl, serverUrl: self.serverUrl, user: self.appDelegate.activeUser)
                 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, fileName: "", user: self.appDelegate.activeUser)
+                self.metadataFolder = NCNetworking.sharedInstance.convertFile(files![0], urlString: self.appDelegate.activeUrl, serverUrl: self.serverUrl, user: self.appDelegate.activeUser)
                 
                 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,9 @@
                
         [[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 fileName:table.fileName user:appDelegate.activeUser];
+                tableMetadata *metadata = [[NCNetworking sharedInstance] convertFile:files[0] urlString:appDelegate.activeUrl serverUrl:table.serverUrl user:appDelegate.activeUser];
+                metadata.fileName = table.fileName;
+                metadata.fileNameView = table.fileName;
                 [[NCManageDatabase sharedInstance] addMetadata:metadata];
                 [self reloadDatasource];
             } 

iOSClient/Synchronize/CCSynchronize.m

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