coding

Cartfile.resolved

@@ -16,7 +16,7 @@ github "kishikawakatsumi/UICKeyChainStore" "v2.1.2"
 github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.1"
 github "marinofaggiana/AFNetworking" "2967678c3e0e98c9b8d7e06222ad12d1f49c26f2"
-github "nextcloud/ios-communication-library" "aac9d492320822d0ace91ec5c2ecde7f373a1e87"
+github "nextcloud/ios-communication-library" "1b9eebce4e9ebb325fa2e7b2b05f0d4d7618b3d0"
 github "realm/realm-cocoa" "v4.4.0"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.4"

iOSClient/Main/CCMain.m

@@ -1377,7 +1377,6 @@
 
     [self tableViewReloadData];
     
-     
     [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:serverUrl depth:@"1" showHiddenFiles:[CCUtility getShowHiddenFiles] account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray *files, NSInteger errorCode, NSString *errorDescription) {
         
         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
@@ -1385,7 +1384,7 @@
             tableMetadata *metadataFolder = [tableMetadata new];
             NSArray *metadatas = [[NCNetworking sharedInstance] convertFilesToMetadatas:files metadataFolder:&metadataFolder];
             //[self insertMetadatasWithAccount:account serverUrl:serverUrl metadataFolder:metadataFolder metadatas:metadatas];
-            NSLog(metadatas);
+            NSLog(@"metadatas");
             
         } else if (errorCode != 0) {
             [[NCContentPresenter shared] messageNotification:@"_error_" description:errorDescription delay:k_dismissAfterSecond type:messageTypeError errorCode:errorCode];
@@ -1427,6 +1426,7 @@
     });
     
     // TEST
+    /*
     [[OCNetworking sharedManager] readFileWithAccount:appDelegate.activeAccount serverUrl:_serverUrl fileName:nil completion:^(NSString *account, tableMetadata *metadata, NSString *message, NSInteger errorCode) {
        
         if (errorCode == 0 && [account isEqualToString:appDelegate.activeAccount]) {
@@ -1439,6 +1439,7 @@
             
         }
     }];
+    */
     
     [[NCCommunication sharedInstance] readFileOrFolderWithServerUrlFileName:self.serverUrl depth:@"0" showHiddenFiles:[CCUtility getShowHiddenFiles] account:appDelegate.activeAccount completionHandler:^(NSString *account, NSArray*files, NSInteger errorCode, NSString *errorMessage) {
           

iOSClient/Networking/NCNetworking.swift

@@ -172,6 +172,7 @@ import NCCommunication
         metadata.fileName = file.fileName
         metadata.fileNameView = file.fileName
         metadata.hasPreview = file.hasPreview
+        metadata.iconName = file.iconName
         metadata.mountType = file.mountType
         metadata.ocId = file.ocId
         metadata.ownerId = file.ownerId
@@ -183,8 +184,7 @@ import NCCommunication
         metadata.resourceType = file.resourceType
         metadata.serverUrl = file.serverUrl
         metadata.size = file.size
-                   
-        CCUtility.insertTypeFileIconName(metadata.fileName, metadata: metadata)
+        metadata.typeFile = file.typeFile
         
         return metadata
     }
@@ -196,34 +196,7 @@ import NCCommunication
         
         for file in files {
                         
-            let metadata = tableMetadata()
-            
-            metadata.account = account
-            metadata.commentsUnread = file.commentsUnread
-            metadata.contentType = file.contentType
-            metadata.creationDate = file.creationDate
-            metadata.date = file.date
-            metadata.directory = file.directory
-            metadata.e2eEncrypted = file.e2eEncrypted
-            metadata.etag = file.etag
-            metadata.favorite = file.favorite
-            metadata.fileId = file.fileId
-            metadata.fileName = file.fileName
-            metadata.fileNameView = file.fileName
-            metadata.hasPreview = file.hasPreview
-            metadata.mountType = file.mountType
-            metadata.ocId = file.ocId
-            metadata.ownerId = file.ownerId
-            metadata.ownerDisplayName = file.ownerDisplayName
-            metadata.permissions = file.permissions
-            metadata.quotaUsedBytes = file.quotaUsedBytes
-            metadata.quotaAvailableBytes = file.quotaAvailableBytes
-            metadata.richWorkspace = file.richWorkspace
-            metadata.resourceType = file.resourceType
-            metadata.serverUrl = file.serverUrl
-            metadata.size = file.size
-                        
-            CCUtility.insertTypeFileIconName(metadata.fileName, metadata: metadata)
+            let metadata = self.convertFileToMetadata(file)
             
             if metadataFolder != nil && counter == 0 {
                 metadataFolder!.initialize(to: metadata)