Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion iOSClient/Data/NCManageDatabase+Metadata.swift
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,12 @@ extension tableMetadata {
!isDirectoryE2EE && !e2eEncrypted && NCMetadataPermissions.canMoveAndDelete(self)
}

var isEndToEndEncrypted: Bool {
e2eEncrypted || isDirectoryE2EE
}

var isModifiableWithQuickLook: Bool {
if directory || isDirectoryE2EE {
if directory || isEndToEndEncrypted {
return false
}
return isPDF || isImage
Expand Down
20 changes: 10 additions & 10 deletions iOSClient/Extensions/UIAlertController+Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -176,23 +176,23 @@ extension UIAlertController {
}, completion: completion)
}

static func alertDeleteFileOrFolder(titleString: String, message: String?, canDeleteServer: Bool, metadatas: [tableMetadata], completion: @escaping (_ cancelled: Bool) -> Void) -> UIAlertController {
static func alertDeleteFileOrFolder(titleString: String,
message: String?,
metadata: tableMetadata,
deleteFromServer: @escaping () -> Void,
completion: @escaping (_ cancelled: Bool) -> Void) -> UIAlertController {
let alertController = UIAlertController(
title: titleString,
message: message,
preferredStyle: .alert)
if canDeleteServer {
alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .destructive) { (_: UIAlertAction) in
Task {
await NCNetworking.shared.setStatusWaitDelete(metadatas: metadatas)
}
completion(false)
})
}
alertController.addAction(UIAlertAction(title: NSLocalizedString("_yes_", comment: ""), style: .destructive) { _ in
deleteFromServer()
completion(false)
})

alertController.addAction(UIAlertAction(title: NSLocalizedString("_remove_local_file_", comment: ""), style: .default) { (_: UIAlertAction) in
Task {
await NCNetworking.shared.deleteCache(metadatas)
await NCNetworking.shared.deleteCache([metadata])
}
completion(false)
})
Expand Down
67 changes: 63 additions & 4 deletions iOSClient/Menu/NCContextMenuActions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,9 @@ enum NCContextMenuActions {
}
}

@MainActor
static func delete(
metadatas: [tableMetadata],
metadata: tableMetadata,
controller: NCMainTabBarController?,
presentViewController: UIViewController? = nil,
completion: (() -> Void)? = nil
Expand All @@ -133,15 +134,73 @@ enum NCContextMenuActions {
image: NCUtility().loadImage(named: "trash"),
attributes: [.destructive]
) { _ in
let presenter = presentViewController ?? controller
let windowScene = presenter?.viewIfLoaded?.window?.windowScene ?? SceneManager.shared.getWindowScene(controller: controller)
let alert = UIAlertController.alertDeleteFileOrFolder(
titleString: NSLocalizedString("_delete_", comment: "") + "?",
message: NSLocalizedString("_want_delete_", comment: ""),
canDeleteServer: true,
metadatas: metadatas
metadata: metadata,
deleteFromServer: {
Task {
await deleteFromServer(ocId: metadata.ocId, windowScene: windowScene)
}
}
) { _ in
completion?()
}
(presentViewController ?? controller)?.present(alert, animated: true)
presenter?.present(alert, animated: true)
}
}

@MainActor
static func deleteFromServer(ocId: String, windowScene: UIWindowScene?) async {
guard let metadata = await NCManageDatabase.shared.getMetadataFromOcIdAsync(ocId) else { return }

let networking = NCNetworking.shared
let context = NCErrorContext.delete(fileName: metadata.fileNameView)
guard metadata.isDeletable else {
let error = NKError(errorCode: NCGlobal.shared.errorNotPermission, errorDescription: "_no_permission_delete_file_")
await showErrorBanner(windowScene: windowScene, error: error, context: context)
return
}

guard metadata.isEndToEndEncrypted else {
let error = await networking.setStatusWaitDelete(metadatas: [metadata])
if error != .success {
await showErrorBanner(windowScene: windowScene, error: error, context: context)
}
return
}

guard networking.isOnline else {
await showErrorBanner(windowScene: windowScene,
title: context.failureTitle ?? "_error_",
text: "_offline_not_allowed_",
errorCode: NCGlobal.shared.errorOfflineNotAllowed)
return
}

let results = showHudBanner(windowScene: windowScene, title: "_delete_in_progress_")
let error = await NCNetworkingE2EEDelete().delete(metadata: metadata)
if error == .success {
completeHudBannerSuccess(token: results.token, banner: results.banner)
} else {
let message = error.userFriendlyMessage(for: context) ?? error.localizedGenericMessage
completeHudBannerError(title: context.failureTitle, description: message, token: results.token, banner: results.banner)
}

await networking.transferDispatcher.notifyAllDelegates { delegate in
if error == .success {
delegate.transferChange(networkingStatus: NCGlobal.shared.networkingStatusDelete,
account: metadata.account,
fileName: metadata.fileName,
serverUrl: metadata.serverUrl,
selector: metadata.sessionSelector,
ocId: metadata.ocId,
destination: nil,
error: error)
}
delegate.transferReloadDataSource(serverUrl: metadata.serverUrl, requestData: false, status: nil)
}
}

Expand Down
35 changes: 2 additions & 33 deletions iOSClient/Menu/NCContextMenuMain.swift
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ class NCContextMenuMain: NSObject {
openingActions.append(NCContextMenuActions.viewInFolder(metadata: metadata, controller: controller, viewController: viewController))
}

if !metadata.isDirectoryE2EE,
if !metadata.isEndToEndEncrypted,
metadata.classFile == NKTypeClassFile.document.rawValue,
NextcloudKit.shared.isNetworkReachable() {
var availableEditors = Set(
Expand Down Expand Up @@ -367,38 +367,7 @@ class NCContextMenuMain: NSObject {
) { _ in
if self.viewController is NCCollectionViewCommon {
Task {
if metadata.isDirectoryE2EE {
let context = NCErrorContext.delete(fileName: metadata.fileNameView)

if NCNetworking.shared.isOffline {
await showErrorBanner(windowScene: self.windowScene,
title: context.failureTitle ?? "_error_",
text: "_offline_not_allowed_",
errorCode: NCGlobal.shared.errorOfflineNotAllowed)
} else {
let results = showHudBanner(windowScene: self.windowScene,
title: "_delete_in_progress_")

let error = await NCNetworkingE2EEDelete().delete(metadata: metadata)

if error == .success {
completeHudBannerSuccess(token: results.token, banner: results.banner)
} else {
let message = error.userFriendlyMessage(for: context) ?? error.localizedGenericMessage

completeHudBannerError(title: context.failureTitle, description: message, token: results.token, banner: results.banner)
}

await NCNetworking.shared.transferDispatcher.notifyAllDelegates { delegate in
delegate.transferReloadDataSource(serverUrl: metadata.serverUrl, requestData: false, status: nil)
}
}
} else {
let error = await NCNetworking.shared.setStatusWaitDelete(metadatas: [metadata])
if error != .success {
await showErrorBanner(windowScene: self.windowScene, error: error, context: .delete(fileName: metadata.fileNameView))
}
}
await NCContextMenuActions.deleteFromServer(ocId: metadata.ocId, windowScene: self.windowScene)
}
} else if let viewController = self.viewController as? NCMedia {
Task {
Expand Down
3 changes: 2 additions & 1 deletion iOSClient/Menu/NCContextMenuViewer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ class NCContextMenuViewer: NSObject {

if !webView,
metadata.isImage,
metadata.isModifiableWithQuickLook,
utilityFileSystem.fileSizeIfExists(metadata) {
editingActions.append(makeModifyPhoto())
}
Expand All @@ -125,7 +126,7 @@ class NCContextMenuViewer: NSObject {

if !webView,
metadata.isDeletable {
deleteActions.append(NCContextMenuActions.delete(metadatas: [metadata], controller: controller, presentViewController: viewController))
deleteActions.append(NCContextMenuActions.delete(metadata: metadata, controller: controller, presentViewController: viewController))
}

var finalMenuElements: [UIMenuElement] = []
Expand Down
1 change: 1 addition & 0 deletions iOSClient/Networking/NCNetworking+TransferDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ extension NCNetworking: NCTransferDelegate {

switch selector {
case NCGlobal.shared.selectorLoadFileQuickLook:
guard metadata.isModifiableWithQuickLook else { return }

let fileNamePath = self.utilityFileSystem.getDirectoryProviderStorageOcId(metadata.ocId,
fileName: metadata.fileNameView,
Expand Down
2 changes: 1 addition & 1 deletion iOSClient/Viewer/NCViewer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class NCViewer: NSObject {

// DOCUMENTS
else if metadata.classFile == NKTypeClassFile.document.rawValue,
!NCUtilityFileSystem().isDirectoryE2EE(serverUrl: metadata.serverUrl, urlBase: session.urlBase, userId: session.userId, account: session.account) {
!metadata.isEndToEndEncrypted {

// PDF
if metadata.isPDF, selectedEditor == nil {
Expand Down
18 changes: 11 additions & 7 deletions iOSClient/Viewer/NCViewerQuickLook/NCViewerQuickLook.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,11 @@ private var hasChangesQuickLook: Bool = false
private let url: URL
private let fileNameSource: String
private var previewItems: [PreviewItem] = []
private var isEditingEnabled: Bool
private let allowsEditing: Bool
private var metadata: tableMetadata?
private var isEditingEnabled: Bool {
allowsEditing && metadata?.isEndToEndEncrypted != true
}
private var timer: Timer?
/// Used to display the save alert
private var viewController: UIViewController?
Expand All @@ -45,7 +48,7 @@ private var hasChangesQuickLook: Bool = false
@objc init(with url: URL, fileNameSource: String = "", isEditingEnabled: Bool, metadata: tableMetadata?) {
self.url = url
self.fileNameSource = fileNameSource
self.isEditingEnabled = isEditingEnabled
self.allowsEditing = isEditingEnabled
if let metadata = metadata {
self.metadata = tableMetadata.init(value: metadata)
}
Expand Down Expand Up @@ -118,7 +121,7 @@ private var hasChangesQuickLook: Bool = false
}

private func showSaveAlert() {
guard let metadata = metadata else { return }
guard isEditingEnabled, let metadata else { return }

let alertController = UIAlertController(title: NSLocalizedString("_save_changes_", comment: ""), message: nil, preferredStyle: .alert)
var message: String?
Expand Down Expand Up @@ -160,7 +163,7 @@ private var hasChangesQuickLook: Bool = false
}

@objc private func crop(_ sender: Any?) {
guard let image = UIImage(contentsOfFile: url.path) else { return }
guard isEditingEnabled, let image = UIImage(contentsOfFile: url.path) else { return }
var toolbarConfig = CropToolbarConfig()

toolbarConfig.heightForVerticalOrientation = 80
Expand Down Expand Up @@ -209,7 +212,7 @@ extension NCViewerQuickLook: QLPreviewControllerDataSource, QLPreviewControllerD
}

fileprivate func saveModifiedFile(override: Bool) {
guard let metadata = self.metadata else {
guard isEditingEnabled, let metadata else {
return
}
if !uploadMetadata {
Expand Down Expand Up @@ -290,15 +293,16 @@ extension NCViewerQuickLook: QLPreviewControllerDataSource, QLPreviewControllerD
}

func previewController(_ controller: QLPreviewController, didSaveEditedCopyOf previewItem: QLPreviewItem, at modifiedContentsURL: URL) {
guard utilityFileSystem.copyFile(atPath: modifiedContentsURL.path, toPath: url.path) else { return }
guard isEditingEnabled,
utilityFileSystem.copyFile(atPath: modifiedContentsURL.path, toPath: url.path) else { return }
hasChangesQuickLook = true
}
}

extension NCViewerQuickLook: CropViewControllerDelegate {
func cropViewControllerDidCrop(_ cropViewController: Mantis.CropViewController, cropped: UIImage, transformation: Mantis.Transformation, cropInfo: Mantis.CropInfo) {
cropViewController.dismiss(animated: true)
guard let data = cropped.jpegData(compressionQuality: 0.9) else { return }
guard isEditingEnabled, let data = cropped.jpegData(compressionQuality: 0.9) else { return }
do {
try data.write(to: self.url)
hasChangesQuickLook = true
Expand Down
Loading