Merge pull request #3727 from nextcloud/editors

Editors - fix detect onlyoffice

Author: marinofaggiana

Nextcloud.xcodeproj/project.pbxproj

@@ -5946,7 +5946,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -6012,7 +6012,7 @@
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				COPY_PHASE_STRIP = NO;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 7;
 				DEVELOPMENT_TEAM = NKUJUXUJ3B;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				ENABLE_TESTABILITY = YES;

iOSClient/Data/NCManageDatabase+Metadata.swift

@@ -262,7 +262,7 @@ extension tableMetadata {
             return false
         }
         let utility = NCUtility()
-        let directEditingEditors = utility.editorsDirectEditing(account: account, contentType: contentType)
+        let directEditingEditors = utility.editorsDirectEditing(account: account, contentType: contentType).map { $0.lowercased() }
         let richDocumentEditor = utility.isTypeFileRichDocument(self)
         let capabilities = NCNetworking.shared.capabilities[account]
 
@@ -272,7 +272,7 @@ extension tableMetadata {
            directEditingEditors.isEmpty {
             // RichDocument: Collabora
             return true
-        } else if directEditingEditors.contains("Nextcloud Text") || directEditingEditors.contains("onlyoffice") {
+        } else if directEditingEditors.contains("nextcloud text") || directEditingEditors.contains("onlyoffice") {
             // DirectEditing: Nextcloud Text - OnlyOffice
            return true
         }
@@ -292,10 +292,12 @@ extension tableMetadata {
     }
 
     var isAvailableDirectEditingEditorView: Bool {
-        guard (classFile == NKTypeClassFile.document.rawValue) && NextcloudKit.shared.isNetworkReachable() else { return false }
-        let editors = NCUtility().editorsDirectEditing(account: account, contentType: contentType)
+        guard (classFile == NKTypeClassFile.document.rawValue) && NextcloudKit.shared.isNetworkReachable() else {
+            return false
+        }
+        let editors = NCUtility().editorsDirectEditing(account: account, contentType: contentType).map { $0.lowercased() }
 
-        if editors.contains("Nextcloud Text") || editors.contains("ONLYOFFICE") {
+        if editors.contains("nextcloud text") || editors.contains("onlyoffice") {
             return true
         }
         return false

iOSClient/Viewer/NCViewer.swift

@@ -132,12 +132,12 @@ class NCViewer: NSObject {
                 var options = NKRequestOptions()
                 var editor = ""
                 var editorViewController = ""
-                let editors = utility.editorsDirectEditing(account: metadata.account, contentType: metadata.contentType)
-                if editors.contains("Nextcloud Text") {
+                let editors = utility.editorsDirectEditing(account: metadata.account, contentType: metadata.contentType).map { $0.lowercased() }
+                if editors.contains("nextcloud text") {
                     editor = "text"
-                    editorViewController = "Nextcloud Text"
+                    editorViewController = "nextcloud text"
                     options = NKRequestOptions(customUserAgent: utility.getCustomUserAgentNCText())
-                } else if editors.contains("ONLYOFFICE") {
+                } else if editors.contains("onlyoffice") {
                     editor = "onlyoffice"
                     editorViewController = "onlyoffice"
                     options = NKRequestOptions(customUserAgent: utility.getCustomUserAgentOnlyOffice())

iOSClient/Viewer/NCViewerNextcloudText/NCViewerNextcloudText.swift

@@ -65,7 +65,7 @@ class NCViewerNextcloudText: UIViewController, WKNavigationDelegate, WKScriptMes
 
         navigationItem.rightBarButtonItems = items
         navigationItem.leftBarButtonItems = nil
-        if editor == "Nextcloud Text" {
+        if editor == "nextcloud text" {
             navigationItem.hidesBackButton = true
         }
 
@@ -93,7 +93,7 @@ class NCViewerNextcloudText: UIViewController, WKNavigationDelegate, WKScriptMes
 
         if editor == "onlyoffice" {
             webView.customUserAgent = utility.getCustomUserAgentOnlyOffice()
-        } else if editor == "Nextcloud Text" {
+        } else if editor == "nextcloud text" {
             webView.customUserAgent = utility.getCustomUserAgentNCText()
         } // else: use default