fix references to legacy encryption app name
This commit is contained in:
parent
a1e60e7882
commit
a0c6c01137
|
@ -115,7 +115,7 @@ class Helper
|
||||||
$entry['id'] = $id++;
|
$entry['id'] = $id++;
|
||||||
$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
|
$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
|
||||||
$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
|
$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
|
||||||
if (\OCP\App::isEnabled('files_encryption')) {
|
if (\OCP\App::isEnabled('encryption')) {
|
||||||
$entry['isPreviewAvailable'] = false;
|
$entry['isPreviewAvailable'] = false;
|
||||||
}
|
}
|
||||||
$files[] = $entry;
|
$files[] = $entry;
|
||||||
|
|
|
@ -476,7 +476,7 @@ class Trashbin {
|
||||||
*/
|
*/
|
||||||
private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp, $user) {
|
private static function deleteEncryptionKeys(\OC\Files\View $view, $file, $filename, $timestamp, $user) {
|
||||||
$size = 0;
|
$size = 0;
|
||||||
if (\OCP\App::isEnabled('files_encryption')) {
|
if (\OCP\App::isEnabled('encryption')) {
|
||||||
|
|
||||||
$keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename);
|
$keyfiles = \OC\Files\Filesystem::normalizePath('files_trashbin/keys/' . $filename);
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ class Test_Trashbin extends \Test\TestCase {
|
||||||
$application->setupPropagation();
|
$application->setupPropagation();
|
||||||
|
|
||||||
//disable encryption
|
//disable encryption
|
||||||
\OC_App::disable('files_encryption');
|
\OC_App::disable('encryption');
|
||||||
|
|
||||||
//configure trashbin
|
//configure trashbin
|
||||||
self::$rememberRetentionObligation = \OC_Config::getValue('trashbin_retention_obligation', Files_Trashbin\Trashbin::DEFAULT_RETENTION_OBLIGATION);
|
self::$rememberRetentionObligation = \OC_Config::getValue('trashbin_retention_obligation', Files_Trashbin\Trashbin::DEFAULT_RETENTION_OBLIGATION);
|
||||||
|
|
|
@ -78,7 +78,7 @@ class ResetPassword extends Command {
|
||||||
/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
|
/** @var $dialog \Symfony\Component\Console\Helper\DialogHelper */
|
||||||
$dialog = $this->getHelperSet()->get('dialog');
|
$dialog = $this->getHelperSet()->get('dialog');
|
||||||
|
|
||||||
if (\OCP\App::isEnabled('files_encryption')) {
|
if (\OCP\App::isEnabled('encryption')) {
|
||||||
$output->writeln(
|
$output->writeln(
|
||||||
'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
|
'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
|
||||||
);
|
);
|
||||||
|
|
Loading…
Reference in New Issue