fix re-shares with encryption

2 files changed, 9 insertions, 5 deletions

diff --git a/lib/private/encryption/update.php b/lib/private/encryption/update.php
index e838e870502..1cfe935e584 100644
--- a/lib/private/encryption/update.php
+++ b/lib/private/encryption/update.php
@@ -94,7 +94,11 @@ class Update {
 	 */
 	private function update($fileSource) {
 		$path = \OC\Files\Filesystem::getPath($fileSource);
-		$absPath = '/' . $this->uid . '/files' . $path;
+		$info = \OC\Files\Filesystem::getFileInfo($path);
+		$owner = \OC\Files\Filesystem::getOwner($path);
+		$view = new \OC\Files\View('/' . $owner . '/files');
+		$ownerPath = $view->getPath($info->getId());
+		$absPath = '/' . $owner . '/files' . $ownerPath;
 
 		$mount = $this->mountManager->find($path);
 		$mountPoint = $mount->getMountPoint();
@@ -110,7 +114,7 @@ class Update {
 
 		foreach ($allFiles as $path) {
 			$usersSharing = $this->file->getAccessList($path);
-			$encryptionModule->update($absPath, $this->uid, $usersSharing);
+			$encryptionModule->update($path, $this->uid, $usersSharing);
 		}
 	}
 
diff --git a/lib/private/encryption/util.php b/lib/private/encryption/util.php
index e2c7fa26e66..54d587715bf 100644
--- a/lib/private/encryption/util.php
+++ b/lib/private/encryption/util.php
@@ -180,11 +180,11 @@ class Util {
 			foreach ($content as $c) {
 				// getDirectoryContent() returns the paths relative to the mount points, so we need
 				// to re-construct the complete path
-				$path = ($mountPoint !== '') ? $mountPoint . '/' .  $c['path'] : $c['path'];
+				$path = ($mountPoint !== '') ? $mountPoint . '/' .  $c->getPath() : $c->getPath();
 				if ($c['type'] === 'dir') {
-					$dirList[] = $path;
+					$dirList[] = \OC\Files\Filesystem::normalizePath($path);
 				} else {
-					$result[] = $path;
+					$result[] =  \OC\Files\Filesystem::normalizePath($path);
 				}
 			}