From 2f7d0bbb18dd00d4d753dddd2925c767ad92f5e3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Tue, 11 Jul 2017 17:55:04 +0200
Subject: [PATCH] Fix propagating changes within jail wrapper

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 apps/files_sharing/lib/SharedStorage.php      | 12 --------
 .../Files/Cache/Wrapper/JailPropagator.php    | 28 +++++++++----------
 lib/private/Files/Storage/Wrapper/Jail.php    | 13 +++++++++
 3 files changed, 27 insertions(+), 26 deletions(-)
 rename apps/files_sharing/lib/SharedPropagator.php => lib/private/Files/Cache/Wrapper/JailPropagator.php (57%)

diff --git a/apps/files_sharing/lib/SharedStorage.php b/apps/files_sharing/lib/SharedStorage.php
index df613bf86b..32304afea0 100644
--- a/apps/files_sharing/lib/SharedStorage.php
+++ b/apps/files_sharing/lib/SharedStorage.php
@@ -376,18 +376,6 @@ class SharedStorage extends \OC\Files\Storage\Wrapper\Jail implements ISharedSto
 		return new \OCA\Files_Sharing\Scanner($storage);
 	}
 
-	public function getPropagator($storage = null) {
-		if (isset($this->propagator)) {
-			return $this->propagator;
-		}
-
-		if (!$storage) {
-			$storage = $this;
-		}
-		$this->propagator = new \OCA\Files_Sharing\SharedPropagator($storage, \OC::$server->getDatabaseConnection());
-		return $this->propagator;
-	}
-
 	public function getOwner($path) {
 		return $this->superShare->getShareOwner();
 	}
diff --git a/apps/files_sharing/lib/SharedPropagator.php b/lib/private/Files/Cache/Wrapper/JailPropagator.php
similarity index 57%
rename from apps/files_sharing/lib/SharedPropagator.php
rename to lib/private/Files/Cache/Wrapper/JailPropagator.php
index f35a5b1d22..297dfce633 100644
--- a/apps/files_sharing/lib/SharedPropagator.php
+++ b/lib/private/Files/Cache/Wrapper/JailPropagator.php
@@ -1,33 +1,33 @@
 <?php
 /**
- * @copyright Copyright (c) 2016, ownCloud, Inc.
+ * @copyright Copyright (c) 2017 Robin Appelman <robin@icewind.nl>
  *
- * @author Robin Appelman <robin@icewind.nl>
- * @author Roeland Jago Douma <roeland@famdouma.nl>
+ * @license GNU AGPL version 3 or any later version
  *
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
  *
- * You should have received a copy of the GNU Affero General Public License, version 3,
- * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
 
-namespace OCA\Files_Sharing;
+namespace OC\Files\Cache\Wrapper;
+
 
 use OC\Files\Cache\Propagator;
+use OC\Files\Storage\Wrapper\Jail;
 
-class SharedPropagator extends Propagator {
+class JailPropagator extends Propagator {
 	/**
-	 * @var \OCA\Files_Sharing\SharedStorage
+	 * @var Jail
 	 */
 	protected $storage;
 
diff --git a/lib/private/Files/Storage/Wrapper/Jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
index 91e8e5ed3c..4fa2428c96 100644
--- a/lib/private/Files/Storage/Wrapper/Jail.php
+++ b/lib/private/Files/Storage/Wrapper/Jail.php
@@ -25,6 +25,7 @@
 namespace OC\Files\Storage\Wrapper;
 
 use OC\Files\Cache\Wrapper\CacheJail;
+use OC\Files\Cache\Wrapper\JailPropagator;
 use OCP\Lock\ILockingProvider;
 
 /**
@@ -488,4 +489,16 @@ class Jail extends Wrapper {
 		}
 		return $this->getWrapperStorage()->moveFromStorage($sourceStorage, $sourceInternalPath, $this->getUnjailedPath($targetInternalPath));
 	}
+
+	public function getPropagator($storage = null) {
+		if (isset($this->propagator)) {
+			return $this->propagator;
+		}
+
+		if (!$storage) {
+			$storage = $this;
+		}
+		$this->propagator = new JailPropagator($storage, \OC::$server->getDatabaseConnection());
+		return $this->propagator;
+	}
 }