markup

iOSClient/Menu/NCViewer+Menu.swift

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

iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift

@@ -95,10 +95,12 @@ import QuickLook
         if editingMode {
             let alertController = UIAlertController(title: NSLocalizedString("_save_", comment: ""), message: "", preferredStyle: .alert)
             
-            alertController.addAction(UIAlertAction(title: NSLocalizedString("_overwrite_original_", comment: ""), style: .default) { (action:UIAlertAction) in
-                self.saveMode = .overwrite
-                self.dismiss(animated: true)
-            })
+            if metadata?.livePhoto == false {
+                alertController.addAction(UIAlertAction(title: NSLocalizedString("_overwrite_original_", comment: ""), style: .default) { (action:UIAlertAction) in
+                    self.saveMode = .overwrite
+                    self.dismiss(animated: true)
+                })
+            }
             alertController.addAction(UIAlertAction(title: NSLocalizedString("_save_as_copy_", comment: ""), style: .default) { (action:UIAlertAction) in
                 self.saveMode = .copy
                 self.dismiss(animated: true)