some typo fixed

diff --git a/3rdparty b/3rdparty
deleted file mode 160000 (submodule)
index 2d59ac4..0000000
--- a/3rdparty
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 2d59ac4f7bd354d9ea7ebea05f863d9f50ccb6ee

diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index a2dee1ca71fe37a63235c1eba69023d8993f9b32..f1042ed759a78deca387bc60d06b93cca52261db 100644 (file)
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -716,8 +716,8 @@ class Util {
                                        $sharingEnabled = \OCP\Share::isEnabled();
 
                                        // if file exists try to get sharing users
-                                       if ($view->file_exists($legacyFile['path'])) {
-                                               $uniqueUserIds = $util->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
+                                       if ($this->view->file_exists($legacyFile['path'])) {
+                                               $uniqueUserIds = $this->getSharingUsersArray($sharingEnabled, $legacyFile['path'], $this->userId);
                                        } else {
                                                $uniqueUserIds[] = $this->userId;
                                        }
@@ -726,7 +726,7 @@ class Util {
                                        $publicKeys = Keymanager::getPublicKeys($this->view, $uniqueUserIds);
 
                                        // Recrypt data, generate catfile
-                                       $recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKey, $newPassphrase, $legacyFile['path'], $publicKeys);
+                                       $recrypted = Crypt::legacyKeyRecryptKeyfile($legacyData, $legacyPassphrase, $publicKeys, $newPassphrase, $legacyFile['path']);
 
                                        $rawPath = $legacyFile['path'];
                                        $relPath = $this->stripUserFilesPath($rawPath);