coding

iOSClient/Main/NCFunctionCenter.swift

@@ -595,6 +595,7 @@ import Queuer
         guard let metadata = NCManageDatabase.shared.getMetadataFromOcId(ocId) else {
             return UIMenu()
         }
+        let isFolderEncrypted = CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase)
         var titleDeleteConfirmFile = NSLocalizedString("_delete_file_", comment: "")
         if metadata.directory { titleDeleteConfirmFile = NSLocalizedString("_delete_folder_", comment: "") }
         var titleSave: String = NSLocalizedString("_save_selected_files_", comment: "")
@@ -682,7 +683,7 @@ import Queuer
             self.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorPrint)
         }
         
-        let openQuickLook = UIAction(title: NSLocalizedString("_open_quicklook_", comment: ""), image: UIImage(systemName: "eye")) { action in
+        let markup = UIAction(title: NSLocalizedString("_markup_", comment: ""), image: UIImage(systemName: "pencil.tip.crop.circle")) { action in
             self.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorLoadFileQuickLook)
         }
         
@@ -690,7 +691,7 @@ import Queuer
             self.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorSaveAsScan)
         }
         
-        let open = UIMenu(title: NSLocalizedString("_open_", comment: ""), image: UIImage(systemName: "square.and.arrow.up"), children: [openIn, openQuickLook])
+        //let open = UIMenu(title: NSLocalizedString("_open_", comment: ""), image: UIImage(systemName: "square.and.arrow.up"), children: [openIn, openQuickLook])
         
         let moveCopy = UIAction(title: NSLocalizedString("_move_or_copy_", comment: ""), image: UIImage(systemName: "arrow.up.right.square")) { action in
             self.openSelectView(items: [metadata], viewController: viewController)
@@ -753,7 +754,7 @@ import Queuer
         
         // FILE
         
-        var children: [UIMenuElement] = [favorite, offline, open, rename, moveCopy, copy, delete]
+        var children: [UIMenuElement] = [favorite, offline, openIn, rename, moveCopy, copy, delete]
 
         if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.typeFile == NCGlobal.shared.metadataTypeFileVideo {
             children.insert(save, at: 2)
@@ -763,7 +764,7 @@ import Queuer
             children.insert(saveAsScan, at: 2)
         }
         
-        if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf" {
+        if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
             children.insert(print, at: 2)
         }
         
@@ -771,6 +772,10 @@ import Queuer
             children.insert(viewInFolder, at: children.count-1)
         }
         
+        if !isFolderEncrypted && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.typeFile == NCGlobal.shared.metadataTypeFileVideo) {
+            children.insert(markup, at: children.count-1)
+        }
+        
         if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage && viewController is NCCollectionViewCommon && !NCBrandOptions.shared.disable_background_image {
             let viewController: NCCollectionViewCommon = viewController as! NCCollectionViewCommon
             let layoutKey = viewController.layoutKey

iOSClient/Menu/NCCollectionViewCommon+Menu.swift

@@ -170,7 +170,7 @@ extension NCCollectionViewCommon {
         //
         // PRINT
         //
-        if !metadata.directory && (metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf") {
+        if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_print_", comment: ""),
@@ -323,6 +323,21 @@ extension NCCollectionViewCommon {
         }
         */
         
+        //
+        // MARKUP
+        //
+        if !isFolderEncrypted && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.typeFile == NCGlobal.shared.metadataTypeFileVideo) {
+            actions.append(
+                NCMenuAction(
+                    title: NSLocalizedString("_markup_", comment: ""),
+                    icon: NCUtility.shared.loadImage(named: "pencil.tip.crop.circle"),
+                    action: { menuAction in
+                        NCFunctionCenter.shared.openDownload(metadata: metadata, selector: NCGlobal.shared.selectorLoadFileQuickLook)
+                    }
+                )
+            )
+        }
+        
         //
         // DELETE
         //
@@ -344,6 +359,8 @@ extension NCCollectionViewCommon {
             )
         )
         
+        
+        
         //
         // SET FOLDER E2EE
         //

iOSClient/Menu/NCViewer+Menu.swift

@@ -52,7 +52,7 @@ extension NCViewer {
             titleDelete = NSLocalizedString("_delete_file_", comment: "")
         }
         
-        let isEncrypted = CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase)
+        let isFolderEncrypted = CCUtility.isFolderEncrypted(metadata.serverUrl, e2eEncrypted: metadata.e2eEncrypted, account: metadata.account, urlBase: metadata.urlBase)
         
         //
         // FAVORITE
@@ -124,7 +124,7 @@ extension NCViewer {
         //
         // PRINT
         //
-        if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf" {
+        if metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_print_", comment: ""),
@@ -264,7 +264,7 @@ extension NCViewer {
         //
         // PDF
         //
-        if (metadata.typeFile == NCGlobal.shared.metadataTypeFileDocument && metadata.contentType == "application/pdf" ) {
+        if metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_search_", comment: ""),
@@ -279,7 +279,7 @@ extension NCViewer {
         //
         // MARKUP
         //
-        if (!isEncrypted && (metadata.typeFile == NCGlobal.shared.metadataTypeFileDocument && metadata.contentType == "application/pdf") || metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.typeFile == NCGlobal.shared.metadataTypeFileVideo) {
+        if !isFolderEncrypted && (metadata.contentType == "com.adobe.pdf" || metadata.contentType == "application/pdf" || metadata.typeFile == NCGlobal.shared.metadataTypeFileImage || metadata.typeFile == NCGlobal.shared.metadataTypeFileVideo) {
             actions.append(
                 NCMenuAction(
                     title: NSLocalizedString("_markup_", comment: ""),

iOSClient/Viewer/NCViewer.swift

@@ -65,7 +65,7 @@ class NCViewer: NSObject {
         if metadata.typeFile == NCGlobal.shared.metadataTypeFileDocument {
                 
             // PDF
-            if metadata.contentType == "application/pdf" {
+            if metadata.contentType == "application/pdf" || metadata.contentType == "com.adobe.pdf" {
                                         
                 if let navigationController = viewController.navigationController {