fixed re-share problems

2 files changed, 15 insertions, 8 deletions

diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php
index 67d289ad68a..c0e493752a0 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@ -200,13 +200,13 @@ class Hooks {
 			$util = new Util($view, $userId);

 			$path = $util->fileIdToPath($params['itemSource']);

 

-			//check if this is a reshare action, that's true if the item source is already shared with me

-			$sharedItem = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['itemSource']);

+            //check if this is a reshare action, that's true if the item source is already shared with me

+			$sharedItem = \OCP\Share::getItemSharedWithBySource($params['itemType'], $params['fileSource']);

 			if ($sharedItem) {

 				// if it is a re-share than the file is located in my Shared folder

 				$path = '/Shared'.$sharedItem['file_target'];

 			} else {

-				$path = $util->fileIdToPath($params['itemSource']);

+				$path = $util->fileIdToPath($params['fileSource']);

 			}

 

 			$sharingEnabled = \OCP\Share::isEnabled();

@@ -224,7 +224,7 @@ class Hooks {
 				$failed = array();

 

 				// Attempt to set shareKey

-				if (!$util->setSharedFileKeyfiles($session, $usersSharing, $path)) {

+ 				if (!$util->setSharedFileKeyfiles($session, $usersSharing, $path)) {

 

 					$failed[] = $path;

 				}

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 4097250b252..eabb34f7ab0 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -983,14 +983,21 @@ class Util {
 	 */
 	public function getAllFiles($dir) {
 		$result = array();
-		
-		$content = $this->view->getDirectoryContent($this->userFilesDir.$dir);
+
+        $content = $this->view->getDirectoryContent($this->userFilesDir.$dir);
+
+        // handling for re shared folders
+        $path_split = explode( '/', $dir );
+        $shared = '';
+        if($path_split[1] === 'Shared') {
+            $shared = '/Shared';
+        }
 
 		foreach ($content as $c) {
 			if ($c['type'] === "dir" ) {
-				$result = array_merge($result, $this->getAllFiles(substr($c['path'],5)));
+                $result = array_merge($result, $this->getAllFiles($shared.substr($c['path'],5)));
 			} else {
-				$result[] = substr($c['path'], 5);
+                $result[] = $shared.substr($c['path'], 5);
 			}
 		}
 		return $result;