fix(attachments): use getRelativePath from userFolder for davPath

Also don't set any davPath at all in public share. We probably don't
have DAV access there anyway.

Signed-off-by: Jonas <jonas@freesources.org>

lib/Service/AttachmentService.php

@@ -237,6 +237,7 @@ public function getAttachmentList(int $documentId, ?string $userId = null, ?Sess
 			: '?documentId=' . $documentId . $shareTokenUrlString;
 
 		$attachments = [];
+		$userFolder = $userId ? $this->rootFolder->getUserFolder($userId) : null;
 		foreach ($attachmentDir->getDirectoryListing() as $node) {
 			if (!($node instanceof File)) {
 				// Ignore anything but files
@@ -251,8 +252,7 @@ public function getAttachmentList(int $documentId, ?string $userId = null, ?Sess
 				'mimetype' => $node->getMimeType(),
 				'mtime' => $node->getMTime(),
 				'isImage' => $isImage,
-				'shareToken' => $shareToken,
-				'davPath' => '/' . implode('/', array_slice(explode('/', $node->getPath()), 3)),
+				'davPath' => $userFolder?->getRelativePath($node->getPath()),
 				'fullUrl' => $isImage
 					? $this->urlGenerator->linkToRouteAbsolute('text.Attachment.getImageFile') . $urlParamsBase . '&imageFileName=' . urlencode($name) . '&preferRawImage=1'
 					: $this->urlGenerator->linkToRouteAbsolute('text.Attachment.getMediaFile') . $urlParamsBase . '&mediaFileName=' . urlencode($name),

src/nodes/ImageView.vue

@@ -276,10 +276,9 @@ export default {
 				&& !OCA.Viewer.file
 				// Viewer supports mimetype
 				&& OCA.Viewer.mimetypes.indexOf(this.attachment.mimetype) !== -1
-				// Attachment has davPath (i.e. is native attachment)
-				&& this.attachment.davPath
-				// Not in share (in public share we probably don't have DAV access)
-				&& !this.attachment.shareToken) {
+				// Attachment has davPath, i.e. is native attachment and not in public share
+				//  (in public share we probably don't have DAV access)
+				&& this.attachment.davPath) {
 				// Viewer exists, is not in use and supports mimetype
 				OCA.Viewer.open({ path: this.attachment.davPath })
 				return