From 03a25410f187457f98820944624dfa8d0b8acfa6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 10 Feb 2018 17:45:04 +0100 Subject: Extract duplicated logic into a method Signed-off-by: Joas Schilling --- apps/files/lib/Activity/Provider.php | 104 ++++++++--------------------------- 1 file changed, 24 insertions(+), 80 deletions(-) diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index 3da1f3c1157..727dbddaeee 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -101,6 +101,14 @@ class Provider implements IProvider { return $this->parseLongVersion($event, $previousEvent); } + protected function setIcon(IEvent $event, $icon) { + if ($this->activityManager->getRequirePNG()) { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', $icon . '.png'))); + } else { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', $icon . '.svg'))); + } + } + /** * @param IEvent $event * @param IEvent|null $previousEvent @@ -113,41 +121,21 @@ class Provider implements IProvider { if ($event->getSubject() === 'created_by') { $subject = $this->l->t('Created by {user}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); - } + $this->setIcon($event, 'add-color'); } else if ($event->getSubject() === 'changed_by') { $subject = $this->l->t('Changed by {user}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'deleted_by') { $subject = $this->l->t('Deleted by {user}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); - } + $this->setIcon($event, 'delete-color'); } else if ($event->getSubject() === 'restored_by') { $subject = $this->l->t('Restored by {user}'); } else if ($event->getSubject() === 'renamed_by') { $subject = $this->l->t('Renamed by {user}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'moved_by') { $subject = $this->l->t('Moved by {user}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else { throw new \InvalidArgumentException(); } @@ -174,85 +162,41 @@ class Provider implements IProvider { if ($event->getSubject() === 'created_self') { $subject = $this->l->t('You created {file}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); - } + $this->setIcon($event, 'add-color'); } else if ($event->getSubject() === 'created_by') { $subject = $this->l->t('{user} created {file}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); - } + $this->setIcon($event, 'add-color'); } else if ($event->getSubject() === 'created_public') { $subject = $this->l->t('{file} was created in a public folder'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'add-color.svg'))); - } + $this->setIcon($event, 'add-color'); } else if ($event->getSubject() === 'changed_self') { $subject = $this->l->t('You changed {file}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'changed_by') { $subject = $this->l->t('{user} changed {file}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'deleted_self') { $subject = $this->l->t('You deleted {file}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); - } + $this->setIcon($event, 'delete-color'); } else if ($event->getSubject() === 'deleted_by') { $subject = $this->l->t('{user} deleted {file}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'delete-color.svg'))); - } + $this->setIcon($event, 'delete-color'); } else if ($event->getSubject() === 'restored_self') { $subject = $this->l->t('You restored {file}'); } else if ($event->getSubject() === 'restored_by') { $subject = $this->l->t('{user} restored {file}'); } else if ($event->getSubject() === 'renamed_self') { $subject = $this->l->t('You renamed {oldfile} to {newfile}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'renamed_by') { $subject = $this->l->t('{user} renamed {oldfile} to {newfile}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'moved_self') { $subject = $this->l->t('You moved {oldfile} to {newfile}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'moved_by') { $subject = $this->l->t('{user} moved {oldfile} to {newfile}'); - if ($this->activityManager->getRequirePNG()) { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.png'))); - } else { - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('files', 'change.svg'))); - } + $this->setIcon($event, 'change'); } else { throw new \InvalidArgumentException(); } -- cgit v1.2.3 From f8c27cb57dd3dbac252cb8d41d0393d2b0d3cbd6 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Sat, 10 Feb 2018 18:09:04 +0100 Subject: Add special handling for e2e encryption Signed-off-by: Joas Schilling --- apps/files/lib/Activity/Provider.php | 109 ++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index 727dbddaeee..eab7e4e44ec 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -28,6 +28,10 @@ use OCP\Activity\IEvent; use OCP\Activity\IEventMerger; use OCP\Activity\IManager; use OCP\Activity\IProvider; +use OCP\Files\Folder; +use OCP\Files\IRootFolder; +use OCP\Files\Node; +use OCP\Files\NotFoundException; use OCP\IL10N; use OCP\IURLGenerator; use OCP\IUser; @@ -53,24 +57,31 @@ class Provider implements IProvider { /** @var IUserManager */ protected $userManager; + /** @var IRootFolder */ + protected $rootFolder; + /** @var IEventMerger */ protected $eventMerger; /** @var string[] cached displayNames - key is the UID and value the displayname */ protected $displayNames = []; + protected $fileIsEncrypted = false; + /** * @param IFactory $languageFactory * @param IURLGenerator $url * @param IManager $activityManager * @param IUserManager $userManager + * @param IRootFolder $rootFolder * @param IEventMerger $eventMerger */ - public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IEventMerger $eventMerger) { + public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IRootFolder $rootFolder, IEventMerger $eventMerger) { $this->languageFactory = $languageFactory; $this->url = $url; $this->activityManager = $activityManager; $this->userManager = $userManager; + $this->rootFolder = $rootFolder; $this->eventMerger = $eventMerger; } @@ -158,28 +169,47 @@ class Provider implements IProvider { * @since 11.0.0 */ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) { + $this->fileIsEncrypted = false; $parsedParameters = $this->getParameters($event); if ($event->getSubject() === 'created_self') { $subject = $this->l->t('You created {file}'); + if ($this->fileIsEncrypted) { + $subject = $this->l->t('You created an encrypted file in {file}'); + } $this->setIcon($event, 'add-color'); } else if ($event->getSubject() === 'created_by') { $subject = $this->l->t('{user} created {file}'); + if ($this->fileIsEncrypted) { + $subject = $this->l->t('{user} created an encrypted file in {file}'); + } $this->setIcon($event, 'add-color'); } else if ($event->getSubject() === 'created_public') { $subject = $this->l->t('{file} was created in a public folder'); $this->setIcon($event, 'add-color'); } else if ($event->getSubject() === 'changed_self') { $subject = $this->l->t('You changed {file}'); + if ($this->fileIsEncrypted) { + $subject = $this->l->t('You changed an encrypted file in {file}'); + } $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'changed_by') { $subject = $this->l->t('{user} changed {file}'); + if ($this->fileIsEncrypted) { + $subject = $this->l->t('{user} changed an encrypted file in {file}'); + } $this->setIcon($event, 'change'); } else if ($event->getSubject() === 'deleted_self') { $subject = $this->l->t('You deleted {file}'); + if ($this->fileIsEncrypted) { + $subject = $this->l->t('You deleted an encrypted file in {file}'); + } $this->setIcon($event, 'delete-color'); } else if ($event->getSubject() === 'deleted_by') { $subject = $this->l->t('{user} deleted {file}'); + if ($this->fileIsEncrypted) { + $subject = $this->l->t('{user} deleted an encrypted file in {file}'); + } $this->setIcon($event, 'delete-color'); } else if ($event->getSubject() === 'restored_self') { $subject = $this->l->t('You restored {file}'); @@ -201,6 +231,10 @@ class Provider implements IProvider { throw new \InvalidArgumentException(); } + if ($this->fileIsEncrypted) { + $event->setSubject($event->getSubject() . '_enc', $event->getSubjectParameters()); + } + if (!isset($parsedParameters['user'])) { // External user via public link share $subject = str_replace('{user}', $this->activityLang->t('"remote user"'), $subject); @@ -305,6 +339,18 @@ class Provider implements IProvider { throw new \InvalidArgumentException('Could not generate file parameter'); } + $encryptionContainer = $this->getEndToEndEncryptionContainer($id, basename($path)); + if ($encryptionContainer instanceof Folder) { + $this->fileIsEncrypted = true; + return [ + 'type' => 'file', + 'id' => $encryptionContainer->getId(), + 'name' => $encryptionContainer->getName(), + 'path' => trim($encryptionContainer->getPath(), '/'), // FIXME remove /user/files/... + 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]), + ]; + } + return [ 'type' => 'file', 'id' => $id, @@ -314,6 +360,67 @@ class Provider implements IProvider { ]; } + protected $fileEncrypted = []; + + /** + * Check if a file is end2end encrypted + * @param int $fileId + * @param string $fileName + * @return bool + */ + protected function getEndToEndEncryptionContainer($fileId, $fileName) { + if (isset($this->fileEncrypted[$fileId])) { + return $this->fileEncrypted[$fileId]; + } + + if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) { + $this->fileEncrypted[$fileId] = false; + return $this->fileEncrypted[$fileId]; + } + + $userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId()); + $files = $userFolder->getById($fileId); + if (empty($files)) { + return null; + } + + $file = array_shift($files); + if ($file instanceof Folder && $file->isEncrypted()) { + // If the folder is encrypted, it is the Container, + // but can be the name is just fine. + $this->fileEncrypted[$fileId] = true; + return null; + } + + $this->fileEncrypted[$fileId] = $this->getParentEndToEndEncryptionContainer($userFolder, $file); + return $this->fileEncrypted[$fileId]; + } + + /** + * Check all parents until the user's root folder if one is encrypted + * + * @param Folder $userFolder + * @param Node $file + * @return Node|null + */ + protected function getParentEndToEndEncryptionContainer(Folder $userFolder, Node $file) { + try { + $parent = $file->getParent(); + + if ($userFolder->getId() === $parent->getId()) { + return null; + } + } catch (\Exception $e) { + return null; + } + + if ($parent->isEncrypted()) { + return $parent; + } + + return $this->getParentEndToEndEncryptionContainer($userFolder, $file); + } + /** * @param string $uid * @return array -- cgit v1.2.3 From d202bae3b592f7d525d28e0b7753d8f642c20431 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Feb 2018 16:05:42 +0100 Subject: Fix path handling for activities Signed-off-by: Joas Schilling --- apps/files/lib/Activity/Provider.php | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index eab7e4e44ec..83f5dbaf787 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -29,6 +29,7 @@ use OCP\Activity\IEventMerger; use OCP\Activity\IManager; use OCP\Activity\IProvider; use OCP\Files\Folder; +use OCP\Files\InvalidPathException; use OCP\Files\IRootFolder; use OCP\Files\Node; use OCP\Files\NotFoundException; @@ -342,13 +343,25 @@ class Provider implements IProvider { $encryptionContainer = $this->getEndToEndEncryptionContainer($id, basename($path)); if ($encryptionContainer instanceof Folder) { $this->fileIsEncrypted = true; - return [ - 'type' => 'file', - 'id' => $encryptionContainer->getId(), - 'name' => $encryptionContainer->getName(), - 'path' => trim($encryptionContainer->getPath(), '/'), // FIXME remove /user/files/... - 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]), - ]; + try { + $fullPath = rtrim($encryptionContainer->getPath(), '/'); + // Remove /user/files/... + list(,,, $path) = explode('/', $fullPath, 4); + if (!$path) { + throw new InvalidPathException('Path could not be split correctly'); + } + + return [ + 'type' => 'file', + 'id' => $encryptionContainer->getId(), + 'name' => $encryptionContainer->getName(), + 'path' => $path, + 'link' => $this->url->linkToRouteAbsolute('files.viewcontroller.showFile', ['fileid' => $encryptionContainer->getId()]), + ]; + } catch (\Exception $e) { + // fall back to the normal one + $this->fileIsEncrypted = false; + } } return [ -- cgit v1.2.3 From 62e982a91f2ca021171b84affd9d7867eb41e387 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 12 Feb 2018 16:25:36 +0100 Subject: Fix problem with deleted files Signed-off-by: Joas Schilling --- apps/files/lib/Activity/Provider.php | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index 83f5dbaf787..fb72d93c248 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -340,7 +340,7 @@ class Provider implements IProvider { throw new \InvalidArgumentException('Could not generate file parameter'); } - $encryptionContainer = $this->getEndToEndEncryptionContainer($id, basename($path)); + $encryptionContainer = $this->getEndToEndEncryptionContainer($id, $path); if ($encryptionContainer instanceof Folder) { $this->fileIsEncrypted = true; try { @@ -378,14 +378,15 @@ class Provider implements IProvider { /** * Check if a file is end2end encrypted * @param int $fileId - * @param string $fileName - * @return bool + * @param string $path + * @return Folder|null */ - protected function getEndToEndEncryptionContainer($fileId, $fileName) { + protected function getEndToEndEncryptionContainer($fileId, $path) { if (isset($this->fileEncrypted[$fileId])) { return $this->fileEncrypted[$fileId]; } + $fileName = basename($path); if (!preg_match('/^[0-9a-fA-F]{32}$/', $fileName)) { $this->fileEncrypted[$fileId] = false; return $this->fileEncrypted[$fileId]; @@ -394,10 +395,18 @@ class Provider implements IProvider { $userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId()); $files = $userFolder->getById($fileId); if (empty($files)) { - return null; + // Deleted, try with parent + $file = $userFolder->get(dirname($path)); + if (!$file instanceof Folder || !$file->isEncrypted()) { + return null; + } + + $this->fileEncrypted[$fileId] = $file; + return $file; } $file = array_shift($files); + if ($file instanceof Folder && $file->isEncrypted()) { // If the folder is encrypted, it is the Container, // but can be the name is just fine. -- cgit v1.2.3 From 825c276e84821b2520390a85136a7e17fcd2be9b Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 28 Feb 2018 15:16:18 +0100 Subject: Do a recursion instead of an endless loop Signed-off-by: Joas Schilling --- apps/files/lib/Activity/Provider.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index fb72d93c248..8c17f402fad 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -440,7 +440,7 @@ class Provider implements IProvider { return $parent; } - return $this->getParentEndToEndEncryptionContainer($userFolder, $file); + return $this->getParentEndToEndEncryptionContainer($userFolder, $parent); } /** -- cgit v1.2.3 From 0b883ab9d940650582e8ee02ada5bf13c2be7915 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 28 Feb 2018 15:40:01 +0100 Subject: Catch exception when the parent is deleted as well Signed-off-by: Joas Schilling --- apps/files/lib/Activity/Provider.php | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php index 8c17f402fad..e868e1c464a 100644 --- a/apps/files/lib/Activity/Provider.php +++ b/apps/files/lib/Activity/Provider.php @@ -395,8 +395,13 @@ class Provider implements IProvider { $userFolder = $this->rootFolder->getUserFolder($this->activityManager->getCurrentUserId()); $files = $userFolder->getById($fileId); if (empty($files)) { - // Deleted, try with parent - $file = $userFolder->get(dirname($path)); + try { + // Deleted, try with parent + $file = $this->findExistingParent($userFolder, dirname($path)); + } catch (NotFoundException $e) { + return null; + } + if (!$file instanceof Folder || !$file->isEncrypted()) { return null; } @@ -418,6 +423,26 @@ class Provider implements IProvider { return $this->fileEncrypted[$fileId]; } + /** + * @param Folder $userFolder + * @param string $path + * @return Folder + * @throws NotFoundException + */ + protected function findExistingParent(Folder $userFolder, $path) { + if ($path === '/') { + throw new NotFoundException('Reached the root'); + } + + try { + $folder = $userFolder->get(dirname($path)); + } catch (NotFoundException $e) { + return $this->findExistingParent($userFolder, dirname($path)); + } + + return $folder; + } + /** * Check all parents until the user's root folder if one is encrypted * -- cgit v1.2.3 From 8b73560cac73e7e3f406514abc5a08a87cede0df Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 28 Feb 2018 16:04:45 +0100 Subject: Fix unit test Signed-off-by: Joas Schilling --- apps/files/tests/Activity/ProviderTest.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apps/files/tests/Activity/ProviderTest.php b/apps/files/tests/Activity/ProviderTest.php index 4a835f42d75..f178ff195e4 100644 --- a/apps/files/tests/Activity/ProviderTest.php +++ b/apps/files/tests/Activity/ProviderTest.php @@ -28,6 +28,7 @@ use OCA\Files\Activity\Provider; use OCP\Activity\IEvent; use OCP\Activity\IEventMerger; use OCP\Activity\IManager; +use OCP\Files\IRootFolder; use OCP\IURLGenerator; use OCP\IUser; use OCP\IUserManager; @@ -49,6 +50,8 @@ class ProviderTest extends TestCase { protected $activityManager; /** @var IUserManager|\PHPUnit_Framework_MockObject_MockObject */ protected $userManager; + /** @var IRootFolder|\PHPUnit_Framework_MockObject_MockObject */ + protected $rootFolder; /** @var IEventMerger|\PHPUnit_Framework_MockObject_MockObject */ protected $eventMerger; @@ -59,6 +62,7 @@ class ProviderTest extends TestCase { $this->url = $this->createMock(IURLGenerator::class); $this->activityManager = $this->createMock(IManager::class); $this->userManager = $this->createMock(IUserManager::class); + $this->rootFolder = $this->createMock(IRootFolder::class); $this->eventMerger = $this->createMock(IEventMerger::class); } @@ -74,6 +78,7 @@ class ProviderTest extends TestCase { $this->url, $this->activityManager, $this->userManager, + $this->rootFolder, $this->eventMerger, ]) ->setMethods($methods) @@ -84,6 +89,7 @@ class ProviderTest extends TestCase { $this->url, $this->activityManager, $this->userManager, + $this->rootFolder, $this->eventMerger ); } -- cgit v1.2.3