Removing files_encryption left overs

6 files changed, 2 insertions, 29 deletions

diff --git a/apps/encryption/settings/settings-personal.php b/apps/encryption/settings/settings-personal.php
index d1da649e374..3266351a07d 100644
--- a/apps/encryption/settings/settings-personal.php
+++ b/apps/encryption/settings/settings-personal.php
@@ -35,7 +35,6 @@ $util = new \OCA\Encryption\Util(
 	\OC::$server->getUserSession(),
 	\OC::$server->getConfig());
 
-$session = new \OCA\Files_Encryption\Session($view);
 $session = \OC::$server->getSession();
 
 $privateKeySet = $session->get('privateKey') !== false;
diff --git a/apps/encryption/templates/settings-admin.php b/apps/encryption/templates/settings-admin.php
index 616c593f6fb..b64e75512e7 100644
--- a/apps/encryption/templates/settings-admin.php
+++ b/apps/encryption/templates/settings-admin.php
@@ -7,7 +7,7 @@ script('core', 'multiselect');
 <form id="encryption" class="section">
 	<h2><?php p($l->t('ownCloud basic encryption module')); ?></h2>
 
-	<?php if($_["initStatus"] === \OCA\Files_Encryption\Session::NOT_INITIALIZED): ?>
+	<?php if(!$_["initStatus"]): ?>
 		<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
 	<?php else: ?>
 	<p id="encryptionSetRecoveryKey">
diff --git a/apps/encryption/templates/settings-personal.php b/apps/encryption/templates/settings-personal.php
index a28df9ac0ec..b7aa0239eea 100644
--- a/apps/encryption/templates/settings-personal.php
+++ b/apps/encryption/templates/settings-personal.php
@@ -5,7 +5,7 @@
 <form id="encryption" class="section">
 	<h2><?php p($l->t('ownCloud basic encryption module')); ?></h2>
 
-	<?php if ( $_["initialized"] === \OCA\Files_Encryption\Session::NOT_INITIALIZED ): ?>
+	<?php if ($_["initialized"] === \OCA\Files_Encryption\Session::NOT_INITIALIZED ): ?>
 
 	<?php p($l->t("Encryption App is enabled but your keys are not initialized, please log-out and log-in again")); ?>
 
diff --git a/apps/files/index.php b/apps/files/index.php
index cfc5b931e13..3f932859029 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -86,10 +86,6 @@ $dirInfo = \OC\Files\Filesystem::getFileInfo('/', false);
 $storageInfo=OC_Helper::getStorageInfo('/', $dirInfo);
 // if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
 $encryptionInitStatus = 2;
-if (OC_App::isEnabled('files_encryption')) {
-	$session = new \OCA\Files_Encryption\Session(new \OC\Files\View('/'));
-	$encryptionInitStatus = $session->getInitialized();
-}
 
 $nav = new OCP\Template('files', 'appnavigation', '');
 
diff --git a/apps/files_sharing/tests/testcase.php b/apps/files_sharing/tests/testcase.php
index 6a831bf5f62..bef727edac7 100644
--- a/apps/files_sharing/tests/testcase.php
+++ b/apps/files_sharing/tests/testcase.php
@@ -45,7 +45,6 @@ abstract class TestCase extends \Test\TestCase {
 
 	const TEST_FILES_SHARING_API_GROUP1 = "test-share-group1";
 
-	public static $stateFilesEncryption;
 	public $filename;
 	public $data;
 	/**
@@ -58,12 +57,6 @@ abstract class TestCase extends \Test\TestCase {
 	public static function setUpBeforeClass() {
 		parent::setUpBeforeClass();
 
-		// remember files_encryption state
-		self::$stateFilesEncryption = \OC_App::isEnabled('files_encryption');
-
-		//we don't want to tests with app files_encryption enabled
-		\OC_App::disable('files_encryption');
-
 		// reset backend
 		\OC_User::clearBackends();
 		\OC_Group::clearBackends();
@@ -100,8 +93,6 @@ abstract class TestCase extends \Test\TestCase {
 
 		$this->data = 'foobar';
 		$this->view = new \OC\Files\View('/' . self::TEST_FILES_SHARING_API_USER1 . '/files');
-
-		$this->assertFalse(\OC_App::isEnabled('files_encryption'));
 	}
 
 	protected function tearDown() {
@@ -120,13 +111,6 @@ abstract class TestCase extends \Test\TestCase {
 		// delete group
 		\OC_Group::deleteGroup(self::TEST_FILES_SHARING_API_GROUP1);
 
-		// reset app files_encryption
-		if (self::$stateFilesEncryption) {
-			\OC_App::enable('files_encryption');
-		} else {
-			\OC_App::disable('files_encryption');
-		}
-
 		\OC_Util::tearDownFS();
 		\OC_User::setUserId('');
 		Filesystem::tearDown();
diff --git a/apps/files_trashbin/tests/trashbin.php b/apps/files_trashbin/tests/trashbin.php
index b3176ebbe92..c98de79cbd0 100644
--- a/apps/files_trashbin/tests/trashbin.php
+++ b/apps/files_trashbin/tests/trashbin.php
@@ -36,7 +36,6 @@ class Test_Trashbin extends \Test\TestCase {
 	private $trashRoot1;
 	private $trashRoot2;
 
-	private static $encryptionStatus;
 	private static $rememberRetentionObligation;
 	private static $rememberAutoExpire;
 
@@ -58,7 +57,6 @@ class Test_Trashbin extends \Test\TestCase {
 		\OCP\Util::connectHook('OC_Filesystem', 'setup', '\OC\Files\Storage\Shared', 'setup');
 
 		//disable encryption
-		self::$encryptionStatus = \OC_App::isEnabled('files_encryption');
 		\OC_App::disable('files_encryption');
 
 		//configure trashbin
@@ -82,10 +80,6 @@ class Test_Trashbin extends \Test\TestCase {
 		// cleanup test user
 		\OC_User::deleteUser(self::TEST_TRASHBIN_USER1);
 
-		if (self::$encryptionStatus === true) {
-			\OC_App::enable('files_encryption');
-		}
-
 		\OC_Config::setValue('trashbin_retention_obligation', self::$rememberRetentionObligation);
 		\OC_Config::setValue('trashbin_auto_expire', self::$rememberAutoExpire);