Skip to content

Fix can't print/share from group folder #3199

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 1 commit into from
Nov 19, 2024
Merged

Fix can't print/share from group folder #3199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 6 additions & 14 deletions iOSClient/Data/NCManageDatabase+Metadata.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,23 +165,15 @@ extension tableMetadata {
return true
}

var isPrintable: Bool {
if isDocumentViewableOnly {
return false
}
if ["application/pdf", "com.adobe.pdf"].contains(contentType) || contentType.hasPrefix("text/") || classFile == NKCommon.TypeClassFile.image.rawValue {
return true
}
return false
}

var isSavebleInCameraRoll: Bool {
return (classFile == NKCommon.TypeClassFile.image.rawValue && contentType != "image/svg+xml") || classFile == NKCommon.TypeClassFile.video.rawValue
}

/*
var isDocumentViewableOnly: Bool {
sharePermissionsCollaborationServices == NCPermissions().permissionReadShare && classFile == NKCommon.TypeClassFile.document.rawValue
}
*/

var isAudioOrVideo: Bool {
return classFile == NKCommon.TypeClassFile.audio.rawValue || classFile == NKCommon.TypeClassFile.video.rawValue
Expand All @@ -208,15 +200,15 @@ extension tableMetadata {
}

var isCopyableInPasteboard: Bool {
!isDocumentViewableOnly && !directory
!directory
}

var isCopyableMovable: Bool {
!isDocumentViewableOnly && !isDirectoryE2EE && !e2eEncrypted
!isDirectoryE2EE && !e2eEncrypted
}

var isModifiableWithQuickLook: Bool {
if directory || isDocumentViewableOnly || isDirectoryE2EE {
if directory || isDirectoryE2EE {
return false
}
return isPDF || isImage
Expand All @@ -234,7 +226,7 @@ extension tableMetadata {
}

var canShare: Bool {
return session.isEmpty && !isDocumentViewableOnly && !directory && !NCBrandOptions.shared.disable_openin_file
return session.isEmpty && !directory && !NCBrandOptions.shared.disable_openin_file
}

var canSetDirectoryAsE2EE: Bool {
Expand Down
43 changes: 18 additions & 25 deletions iOSClient/Menu/NCContextMenu.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,35 +197,28 @@ class NCContextMenu: NSObject {
} else {
if metadata.lock {
menu.append(favorite)
if metadata.isDocumentViewableOnly {
//
} else {
menu.append(share)
if self.database.getMetadataLivePhoto(metadata: metadata) != nil {
menu.append(livePhotoSave)
}
menu.append(share)

if self.database.getMetadataLivePhoto(metadata: metadata) != nil {
menu.append(livePhotoSave)
}
} else {
menu.append(favorite)
if metadata.isDocumentViewableOnly {
if viewController is NCMedia {
menu.append(viewInFolder)
}
} else {
menu.append(share)
if self.database.getMetadataLivePhoto(metadata: metadata) != nil {
menu.append(livePhotoSave)
}

if viewController is NCMedia {
menu.append(viewInFolder)
}

// MODIFY WITH QUICK LOOK
if metadata.isModifiableWithQuickLook {
menu.append(modify)
}
menu.append(share)

if self.database.getMetadataLivePhoto(metadata: metadata) != nil {
menu.append(livePhotoSave)
}

if viewController is NCMedia {
menu.append(viewInFolder)
}

// MODIFY WITH QUICK LOOK
if metadata.isModifiableWithQuickLook {
menu.append(modify)
}

if viewController is NCMedia {
menu.append(deleteConfirmFile)
} else {
Expand Down