wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #18834 from owncloud/delay-listen-owner-changes

Browse source 
Delay listening to owner changes untill we use a share for that owner
This commit is contained in:
Thomas Müller 2015-09-24 15:06:27 +02:00
commit 30377e958f
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/files_sharing/lib/mountprovider.php
View file

@ -69,12 +69,11 @@ class MountProvider implements IMountProvider {
// for updating etags for the share owner when we make changes to this share.
$ownerPropagator = $this->propagationManager->getChangePropagator($share['uid_owner']);
// for updating our etags when changes are made to the share from the owners side (probably indirectly by us trough another share)
$this->propagationManager->listenToOwnerChanges($share['uid_owner'], $user->getUID());
return new SharedMount(
'\OC\Files\Storage\Shared',
'/' . $user->getUID() . '/' . $share['file_target'],
array(
'propagationManager' => $this->propagationManager,
'propagator' => $ownerPropagator,
'share' => $share,
'user' => $user->getUID()

21
apps/files_sharing/lib/sharedstorage.php
View file

@ -50,13 +50,34 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
*/
private $ownerView;
/**
* @var \OCA\Files_Sharing\Propagation\PropagationManager
*/
private $propagationManager;
/**
* @var string
*/
private $user;
private $initialized = false;
public function __construct($arguments) {
$this->share = $arguments['share'];
$this->ownerView = $arguments['ownerView'];
$this->propagationManager = $arguments['propagationManager'];
$this->user = $arguments['user'];
}
private function init() {
if ($this->initialized) {
return;
}
$this->initialized = true;
Filesystem::initMountPoints($this->share['uid_owner']);
// for updating our etags when changes are made to the share from the owners side (probably indirectly by us trough another share)
$this->propagationManager->listenToOwnerChanges($this->share['uid_owner'], $this->user);
}
/**