removing deletion of encryption keys
this will be handled in the wrapper now
This commit is contained in:
parent
a0c6c01137
commit
d557519746
|
@ -425,7 +425,6 @@ class Trashbin {
|
||||||
}
|
}
|
||||||
|
|
||||||
$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
|
$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
|
||||||
$size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp, $user);
|
|
||||||
|
|
||||||
if ($view->is_dir('/files_trashbin/files/' . $file)) {
|
if ($view->is_dir('/files_trashbin/files/' . $file)) {
|
||||||
$size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin/files/' . $file));
|
$size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin/files/' . $file));
|
||||||
|
@ -467,31 +466,6 @@ class Trashbin {
|
||||||
return $size;
|
return $size;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param \OC\Files\View $view
|
|
||||||
* @param $file
|
|
||||||
* @param $filename
|
|
||||||
* @param $timestamp
|
|
||||||
* @return int
|
|
||||||
*/
|
|
||||||
private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp, $user) {
|
|
||||||
$size = 0;
|
|
||||||
if (\OCP\App::isEnabled('encryption')) {
|
|
||||||
|
|
||||||
$keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename);
|
|
||||||
|
|
||||||
if ($timestamp) {
|
|
||||||
$keyfiles .= '.d' . $timestamp;
|
|
||||||
}
|
|
||||||
if ($view->is_dir($keyfiles)) {
|
|
||||||
$size += self::calculateSize(new \OC\Files\View('/' . $user . '/' . $keyfiles));
|
|
||||||
$view->deleteAll($keyfiles);
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return $size;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* check to see whether a file exists in trashbin
|
* check to see whether a file exists in trashbin
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue