summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDaniel Calviño Sánchez <danxuliu@gmail.com>2018-06-29 10:40:02 +0200
committerDaniel Calviño Sánchez <danxuliu@gmail.com>2018-08-08 14:25:43 +0200
commitd9458b303a422c968673dafc45367c0716037e1a (patch)
tree4c68f03960500ba2b13c041e7d95e72fddcd4241 /lib
parent4ee839d69c83bcd71d194864eed47f4448a6ca85 (diff)
downloadnextcloud-server-d9458b303a422c968673dafc45367c0716037e1a.tar.gz
nextcloud-server-d9458b303a422c968673dafc45367c0716037e1a.zip
Add support for room shares to the share manager
Room shares are implemented in an external app (Nextcloud Talk), so in order to keep the share manager as isolated as possible from room share specifics all the validity checks are done in the provider of room shares. However, due to the code structure it is necessary to explicitly check for room shares in "generalCreateChecks" to prevent an exception from being thrown. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/Share20/Manager.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/private/Share20/Manager.php b/lib/private/Share20/Manager.php
index d0316b44c1a..7cfa83dbb4a 100644
--- a/lib/private/Share20/Manager.php
+++ b/lib/private/Share20/Manager.php
@@ -239,6 +239,7 @@ class Manager implements IManager {
if ($circle === null) {
throw new \InvalidArgumentException('SharedWith is not a valid circle');
}
+ } else if ($share->getShareType() === \OCP\Share::SHARE_TYPE_ROOM) {
} else {
// We can't handle other types yet
throw new \InvalidArgumentException('unknown share type');