marinofaggiana 4 năm trước cách đây
mục cha
commit
cd94950416
2 tập tin đã thay đổi với 10 bổ sung4 xóa
  1. 6 0
      Share/NCShareExtension.swift
  2. 4 4
      iOSClient/Data/NCManageDatabase.swift

+ 6 - 0
Share/NCShareExtension.swift

@@ -640,9 +640,15 @@ extension NCShareExtension: UITableViewDataSource {
         imageCell?.layer.masksToBounds = true
 
         let fileName = filesName[indexPath.row]
+        let resultInternalType = NCCommunicationCommon.shared.getInternalType(fileName: fileName, mimeType: "", directory: false)
+                
         imageCell?.image = NCUtility.shared.loadImage(named: "doc", color: NCBrandColor.shared.customer)
         if let image = UIImage(contentsOfFile: (NSTemporaryDirectory() + fileName)) {
             imageCell?.image = image
+        } else {
+            if resultInternalType.iconName.count > 0 {
+                imageCell?.image = UIImage.init(named: resultInternalType.iconName)
+            }
         }
         
         fileNameCell?.text = fileName

+ 4 - 4
iOSClient/Data/NCManageDatabase.swift

@@ -1895,15 +1895,15 @@ class NCManageDatabase: NSObject {
     @objc func createMetadata(account: String, fileName: String, fileNameView: String, ocId: String, serverUrl: String, urlBase: String, url: String, contentType: String, livePhoto: Bool, chunk: Bool) -> tableMetadata {
         
         let metadata = tableMetadata()
-        let results = NCCommunicationCommon.shared.getInternalType(fileName: fileName, mimeType: contentType, directory: false)
+        let resultInternalType = NCCommunicationCommon.shared.getInternalType(fileName: fileName, mimeType: contentType, directory: false)
         
         metadata.account = account
         metadata.chunk = chunk
-        metadata.contentType = results.mimeType
+        metadata.contentType = resultInternalType.mimeType
         metadata.creationDate = Date() as NSDate
         metadata.date = Date() as NSDate
         metadata.hasPreview = true
-        metadata.iconName = results.iconName
+        metadata.iconName = resultInternalType.iconName
         metadata.etag = ocId
         metadata.ext = (fileName as NSString).pathExtension.lowercased()
         metadata.fileName = fileName
@@ -1913,7 +1913,7 @@ class NCManageDatabase: NSObject {
         metadata.ocId = ocId
         metadata.permissions = "RGDNVW"
         metadata.serverUrl = serverUrl
-        metadata.typeFile = results.typeFile
+        metadata.typeFile = resultInternalType.typeFile
         metadata.uploadDate = Date() as NSDate
         metadata.url = url
         metadata.urlBase = urlBase