diff options
Diffstat (limited to 'apps/files_encryption/hooks/hooks.php')
| -rw-r--r-- | apps/files_encryption/hooks/hooks.php | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/hooks/hooks.php index 087ba3d893c..90a93b4c52d 100644 --- a/apps/files_encryption/hooks/hooks.php +++ b/apps/files_encryption/hooks/hooks.php @@ -67,13 +67,13 @@ class Hooks { // If migration not yet done
if ( ! $migrationCompleted ) {
- $view1 = new \OC_FilesystemView( '/' . $params['uid'] );
+ $userView = new \OC_FilesystemView( '/' . $params['uid'] );
// Set legacy encryption key if it exists, to support
// depreciated encryption system
- if (
- $view1->file_exists( 'encryption.key' )
- && $encLegacyKey = $view1->file_get_contents( 'encryption.key' )
+ if (
+ $userView->file_exists( 'encryption.key' )
+ && $encLegacyKey = $userView->file_get_contents( 'encryption.key' )
) {
$plainLegacyKey = Crypt::legacyDecrypt( $encLegacyKey, $params['password'] );
@@ -412,25 +412,11 @@ class Hooks { // Unshare every user who no longer has access to the file
$delUsers = array_diff( $userIds, $sharingUsers);
-
- if ( !Keymanager::delShareKey( $view, $delUsers, $path ) ) {
-
- $failed[] = $path;
-
- }
+ // delete share key
+ Keymanager::delShareKey( $view, $delUsers, $path );
}
- // If no attempts to set keyfiles failed
- if ( empty( $failed ) ) {
-
- return true;
-
- } else {
-
- return false;
-
- }
}
}
|