Ver Fonte

iOS 12.0,* don't detect UTI text/markdown, text/x-markdown

Signed-off-by: marinofaggiana <ios@nextcloud.com>
marinofaggiana há 2 anos atrás
pai
commit
c5c22c5d7b

+ 7 - 2
iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -88,8 +88,8 @@ extension NCManageDatabase {
         }
         }
         metadata.size = file.size
         metadata.size = file.size
         metadata.classFile = file.classFile
         metadata.classFile = file.classFile
-        //FIXME: iOS 12.0,* don't detect UTI "text/markdown"
-        if metadata.contentType == "text/markdown" && metadata.classFile == NCCommunicationCommon.typeClassFile.unknow.rawValue {
+        //FIXME: iOS 12.0,* don't detect UTI text/markdown, text/x-markdown
+        if (metadata.contentType == "text/markdown" || metadata.contentType == "text/x-markdown") && metadata.classFile == NCCommunicationCommon.typeClassFile.unknow.rawValue {
             metadata.classFile = NCCommunicationCommon.typeClassFile.document.rawValue
             metadata.classFile = NCCommunicationCommon.typeClassFile.document.rawValue
         }
         }
         if let date = file.uploadDate {
         if let date = file.uploadDate {
@@ -180,6 +180,11 @@ extension NCManageDatabase {
             metadata.contentType = mimeType
             metadata.contentType = mimeType
             metadata.iconName = iconName
             metadata.iconName = iconName
             metadata.classFile = classFile
             metadata.classFile = classFile
+            //FIXME: iOS 12.0,* don't detect UTI text/markdown, text/x-markdown
+            if classFile == NCCommunicationCommon.typeClassFile.unknow.rawValue && (mimeType == "text/x-markdown" || mimeType == "text/markdown") {
+                metadata.iconName = NCCommunicationCommon.typeIconFile.txt.rawValue
+                metadata.classFile = NCCommunicationCommon.typeClassFile.document.rawValue
+            }
         }
         }
         if let iconUrl = iconUrl {
         if let iconUrl = iconUrl {
             metadata.iconUrl = iconUrl
             metadata.iconUrl = iconUrl

+ 5 - 2
iOSClient/Main/Create cloud/NCCreateFormUploadDocuments.swift

@@ -337,8 +337,11 @@ import XLForm
                 if errorCode == 0 && account == self.appDelegate.account {
                 if errorCode == 0 && account == self.appDelegate.account {
 
 
                     if url != nil && url!.count > 0 {
                     if url != nil && url!.count > 0 {
-                        let results = NCCommunicationCommon.shared.getInternalType(fileName: fileName, mimeType: "", directory: false)
-
+                        var results = NCCommunicationCommon.shared.getInternalType(fileName: fileName, mimeType: "", directory: false)
+                        //FIXME: iOS 12.0,* don't detect UTI text/markdown, text/x-markdown
+                        if results.mimeType.isEmpty {
+                            results.mimeType = "text/x-markdown"
+                        }
                         self.dismiss(animated: true, completion: {
                         self.dismiss(animated: true, completion: {
                             let metadata = NCManageDatabase.shared.createMetadata(account: self.appDelegate.account, user: self.appDelegate.user, userId: self.appDelegate.userId, fileName: fileName, fileNameView: fileName, ocId: CCUtility.createRandomString(12), serverUrl: self.serverUrl, urlBase: self.appDelegate.urlBase, url: url ?? "", contentType: results.mimeType)
                             let metadata = NCManageDatabase.shared.createMetadata(account: self.appDelegate.account, user: self.appDelegate.user, userId: self.appDelegate.userId, fileName: fileName, fileNameView: fileName, ocId: CCUtility.createRandomString(12), serverUrl: self.serverUrl, urlBase: self.appDelegate.urlBase, url: url ?? "", contentType: results.mimeType)