Merge branch 'addressbook-uid-check-migration' of https://github.com/nextcloud/server into addressbook-uid-check-migration

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 12 insertions, 2 deletions

diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php
index ff19c35e2b5..a935189491e 100644
--- a/apps/files_sharing/lib/Controller/ShareAPIController.php
+++ b/apps/files_sharing/lib/Controller/ShareAPIController.php
@@ -252,6 +252,7 @@ class ShareAPIController extends OCSController {
 
 
 		$result['mail_send'] = $share->getMailSend() ? 1 : 0;
+		$result['hide_download'] = $share->getHideDownload() ? 1 : 0;
 
 		return $result;
 	}
@@ -745,6 +746,7 @@ class ShareAPIController extends OCSController {
 	 * @param string $publicUpload
 	 * @param string $expireDate
 	 * @param string $note
+	 * @param string $hideDownload
 	 * @return DataResponse
 	 * @throws LockedException
 	 * @throws NotFoundException
@@ -759,7 +761,8 @@ class ShareAPIController extends OCSController {
 		string $sendPasswordByTalk = null,
 		string $publicUpload = null,
 		string $expireDate = null,
-		string $note = null
+		string $note = null,
+		string $hideDownload = null
 	): DataResponse {
 		try {
 			$share = $this->getShareById($id);
@@ -773,7 +776,7 @@ class ShareAPIController extends OCSController {
 			throw new OCSNotFoundException($this->l->t('Wrong share ID, share doesn\'t exist'));
 		}
 
-		if ($permissions === null && $password === null && $sendPasswordByTalk === null && $publicUpload === null && $expireDate === null && $note === null) {
+		if ($permissions === null && $password === null && $sendPasswordByTalk === null && $publicUpload === null && $expireDate === null && $note === null && $hideDownload === null) {
 			throw new OCSBadRequestException($this->l->t('Wrong or no update parameter given'));
 		}
 
@@ -786,6 +789,13 @@ class ShareAPIController extends OCSController {
 		 */
 		if ($share->getShareType() === Share::SHARE_TYPE_LINK) {
 
+			// Update hide download state
+			if ($hideDownload === 'true') {
+				$share->setHideDownload(true);
+			} else if ($hideDownload === 'false') {
+				$share->setHideDownload(false);
+			}
+
 			$newPermissions = null;
 			if ($publicUpload === 'true') {
 				$newPermissions = Constants::PERMISSION_READ | Constants::PERMISSION_CREATE | Constants::PERMISSION_UPDATE | Constants::PERMISSION_DELETE;