Move moveFromCache to CacheJail

apps/files_sharing/lib/cache.php

@@ -102,8 +102,4 @@ protected function formatCacheEntry($entry) {
 	public function clear() {
 		// Not a valid action for Shared Cache
 	}
-
-	public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
-		parent::moveFromCache($sourceCache, $sourcePath, $this->storage->getSourcePath($targetPath));
-	}
 }

lib/private/files/cache/wrapper/cachejail.php

@@ -281,4 +281,20 @@ public function getPathById($id) {
 		$path = $this->cache->getPathById($id);
 		return $this->getJailedPath($path);
 	}
+
+	/**
+	 * Move a file or folder in the cache
+	 *
+	 * Note that this should make sure the entries are removed from the source cache
+	 *
+	 * @param \OCP\Files\Cache\ICache $sourceCache
+	 * @param string $sourcePath
+	 * @param string $targetPath
+	 */
+	public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
+		if ($sourceCache === $this) {
+			return $this->move($sourcePath, $targetPath);
+		}
+		return $this->cache->moveFromCache($sourceCache, $sourcePath, $targetPath);
+	}
 }