Merge pull request #15985 from owncloud/hotfix/fix-encryption-references

[enc2] fix references to legacy encryption app name

3 files changed, 1 insertions, 30 deletions

diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index bc9ebd6ee02..320ad2eeb8e 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -115,9 +115,6 @@ class Helper
 			$entry['id'] = $id++;
 			$entry['etag'] = $entry['mtime']; // add fake etag, it is only needed to identify the preview image
 			$entry['permissions'] = \OCP\Constants::PERMISSION_READ;
-			if (\OCP\App::isEnabled('files_encryption')) {
-				$entry['isPreviewAvailable'] = false;
-			}
 			$files[] = $entry;
 		}
 		return $files;
diff --git a/apps/files_trashbin/lib/trashbin.php b/apps/files_trashbin/lib/trashbin.php
index 6a1dcf3fce2..baa0c4cbe71 100644
--- a/apps/files_trashbin/lib/trashbin.php
+++ b/apps/files_trashbin/lib/trashbin.php
@@ -479,7 +479,6 @@ class Trashbin {
 		}
 
 		$size += self::deleteVersions($view, $file, $filename, $timestamp, $user);
-		$size += self::deleteEncryptionKeys($view, $file, $filename, $timestamp, $user);
 
 		if ($view->is_dir('/files_trashbin/files/' . $file)) {
 			$size += self::calculateSize(new \OC\Files\View('/' . $user . '/files_trashbin/files/' . $file));
@@ -522,31 +521,6 @@ class Trashbin {
 	}
 
 	/**
-	 * @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('files_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
 	 *
 	 * @param string $filename path to the file
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index 0c37af24de5..5535b3315bc 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -67,7 +67,7 @@ class Test_Trashbin extends \Test\TestCase {
 		$application->setupPropagation();
 
 		//disable encryption
-		\OC_App::disable('files_encryption');
+		\OC_App::disable('encryption');
 
 		//configure trashbin
 		self::$rememberRetentionObligation = \OC_Config::getValue('trashbin_retention_obligation', Files_Trashbin\Trashbin::DEFAULT_RETENTION_OBLIGATION);