marinofaggiana 4 years ago
parent
commit
8b6127cfc9
2 changed files with 5 additions and 53 deletions
  1. 1 1
      Cartfile.resolved
  2. 4 52
      iOSClient/Utility/CCUtility.m

+ 1 - 1
Cartfile.resolved

@@ -16,7 +16,7 @@ github "krzyzanowskim/OpenSSL" "1.0.218"
 github "malcommac/SwiftRichString" "3.7.1"
 github "marinofaggiana/AFNetworking" "2967678c3e0e98c9b8d7e06222ad12d1f49c26f2"
 github "marinofaggiana/KTVHTTPCache" "2.0.2"
-github "nextcloud/ios-communication-library" "fb09dc1eeb40d11701ad8e09f15c394c11b21d1d"
+github "nextcloud/ios-communication-library" "2c670fe1d7b3c2500dcd3de880f24c18ca936624"
 github "realm/realm-cocoa" "v4.4.1"
 github "rechsteiner/Parchment" "v1.7.0"
 github "scenee/FloatingPanel" "v1.7.4"

+ 4 - 52
iOSClient/Utility/CCUtility.m

@@ -1632,62 +1632,14 @@
     metadata.status = status;
     metadata.url = url;
     
-    [self insertTypeFileIconName:fileName metadata:metadata];
+    NSDictionary *results = [[NCCommunicationCommon sharedInstance] objcGetInternalContenTypeWithFileName:fileName contentType:@"" directory:directory];
     
-    return metadata;
-}
+    metadata.contentType = results[@"contentType"];
+    metadata.iconName = results[@"iconName"];
+    metadata.typeFile = results[@"typeFile"];
 
-/*
-+ (tableMetadata *)trasformedOCFileToCCMetadata:(OCFileDto *)itemDto fileName:(NSString *)fileName serverUrl:(NSString *)serverUrl  account:(NSString *)account isFolderEncrypted:(BOOL)isFolderEncrypted
-{
-    tableMetadata *metadata = [tableMetadata new];
-    NSString *fileNameView;
-    
-    fileName = [CCUtility removeForbiddenCharactersServer:fileName];
-    fileNameView = fileName;
-    
-    // E2EE find the fileName for fileNameView
-    if (isFolderEncrypted) {
-        tableE2eEncryption *tableE2eEncryption = [[NCManageDatabase sharedInstance] getE2eEncryptionWithPredicate:[NSPredicate predicateWithFormat:@"account == %@ AND serverUrl == %@ AND fileNameIdentifier == %@", account, serverUrl, fileName]];
-        if (tableE2eEncryption)
-            fileNameView = tableE2eEncryption.fileName;
-    }
-    
-    metadata.account = account;
-    metadata.commentsUnread = itemDto.commentsUnread;
-    metadata.contentType = itemDto.contentType;
-    metadata.date = [NSDate dateWithTimeIntervalSince1970:itemDto.date];
-    metadata.directory = itemDto.isDirectory;
-    metadata.e2eEncrypted = itemDto.isEncrypted;
-    metadata.etag = itemDto.etag;
-    metadata.fileId = itemDto.fileId;
-    metadata.favorite = itemDto.isFavorite;
-    metadata.fileName = fileName;
-    metadata.fileNameView = fileNameView;
-    metadata.hasPreview = itemDto.hasPreview;
-    metadata.iconName = @"";
-    metadata.mountType = itemDto.mountType;
-    metadata.ocId = itemDto.ocId;
-    metadata.ownerId = itemDto.ownerId;
-    metadata.ownerDisplayName = itemDto.ownerDisplayName;
-    metadata.permissions = itemDto.permissions;
-    metadata.quotaUsedBytes = itemDto.quotaUsedBytes;
-    metadata.quotaAvailableBytes = itemDto.quotaAvailableBytes;
-    metadata.resourceType = itemDto.resourceType;
-    metadata.serverUrl = serverUrl;
-    metadata.sessionTaskIdentifier = k_taskIdentifierDone;
-    metadata.size = itemDto.size;
-    metadata.status = k_metadataStatusNormal;
-    metadata.typeFile = @"";
-    metadata.trashbinFileName = itemDto.trashbinFileName;
-    metadata.trashbinOriginalLocation = itemDto.trashbinOriginalLocation;
-    metadata.trashbinDeletionTime = [NSDate dateWithTimeIntervalSince1970:itemDto.trashbinDeletionTime];
-    
-    [self insertTypeFileIconName:fileNameView metadata:metadata];
- 
     return metadata;
 }
-*/
 
 + (NSString *)insertTypeFileIconName:(NSString *)fileNameView metadata:(tableMetadata *)metadata
 {