take the etag of child mounts into account for the folder etag

this replaces shared etag propagation

1 files changed, 7 insertions, 9 deletions

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 18e02844179..4807b5ee738 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -51,11 +51,6 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	private $ownerView;
 
 	/**
-	 * @var \OCA\Files_Sharing\Propagation\PropagationManager
-	 */
-	private $propagationManager;
-
-	/**
 	 * @var string
 	 */
 	private $user;
@@ -65,7 +60,6 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 	public function __construct($arguments) {
 		$this->share = $arguments['share'];
 		$this->ownerView = $arguments['ownerView'];
-		$this->propagationManager = $arguments['propagationManager'];
 		$this->user = $arguments['user'];
 	}
 
@@ -75,9 +69,6 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 		}
 		$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);
 	}
 
 	/**
@@ -571,6 +562,13 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 		return new \OC\Files\Cache\Shared_Watcher($storage);
 	}
 
+	public function getPropagator($storage = null) {
+		if (!$storage) {
+			$storage = $this;
+		}
+		return new \OCA\Files_Sharing\SharedPropagator($storage);
+	}
+
 	public function getOwner($path) {
 		if ($path == '') {
 			$path = $this->getMountPoint();