we no longer need to keep the session open for encryption

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index b960e02ced741c0eecd0a5535eb963bd386195f7..aeb0008a7b94443094bf77e9f316fc2625faea5a 100644 (file)
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -1,5 +1,7 @@
 <?php
 
+\OC::$server->getSession()->close();
+
 // Firefox and Konqueror tries to download application/json for me.  --Arthur
 OCP\JSON::setContentTypeHeader('text/plain');
 
@@ -64,13 +66,7 @@ if (empty($_POST['dirToken'])) {
        }
 }
 
-
 OCP\JSON::callCheck();
-if (!\OCP\App::isEnabled('files_encryption')) {
-       // encryption app need to create keys later, so can't close too early
-       \OC::$server->getSession()->close();
-}
-
 
 // get array with current storage stats (e.g. max file size)
 $storageStats = \OCA\Files\Helper::buildFileStorageStatistics($dir);

diff --git a/apps/files_sharing/lib/controllers/sharecontroller.php b/apps/files_sharing/lib/controllers/sharecontroller.php
index 71b5ab7f8c8d458a9ad868de388af28144ea7d33..5f653e5c22706578b639a543f183aae80324131c 100644 (file)
--- a/apps/files_sharing/lib/controllers/sharecontroller.php
+++ b/apps/files_sharing/lib/controllers/sharecontroller.php
@@ -205,7 +205,6 @@ class ShareController extends Controller {
        /**
         * @PublicPage
         * @NoCSRFRequired
-        * @UseSession
         *
         * @param string $token
         * @param string $files
@@ -215,12 +214,6 @@ class ShareController extends Controller {
        public function downloadShare($token, $files = null, $path = '') {
                \OC_User::setIncognitoMode(true);
 
-               // FIXME: Use DI once there is a suitable class
-               if (!\OCP\App::isEnabled('files_encryption')) {
-                       // encryption app requires the session to store the keys in
-                       \OC::$server->getSession()->close();
-               }
-
                $linkItem = OCP\Share::getShareByToken($token, false);
 
                // Share is password protected - check whether the user is permitted to access the share
@@ -246,7 +239,7 @@ class ShareController extends Controller {
                        }
 
                        // FIXME: The exit is required here because otherwise the AppFramework is trying to add headers as well
-                       // after dispatching the request which results in a "Cannot modify header information" notice. 
+                       // after dispatching the request which results in a "Cannot modify header information" notice.
                        OC_Files::get($originalSharePath, $files_list, $_SERVER['REQUEST_METHOD'] == 'HEAD');
                        exit();
                } else {