Merge branch 'master' into files_encryption_check_private_key

Conflicts:
	apps/files_encryption/appinfo/app.php
	apps/files_encryption/lib/util.php

diff --cc apps/files_encryption/appinfo/app.php
index 6e68d81ba00fedffc929fb55dc529e1436df8ac0,f69e04b5bbf779403640c8ae7acaeab85f8d429f..419bef1edef09183b09e92a68cbc366bbfcfd8df
--- 1/apps/files_encryption/appinfo/app.php
--- 2/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@@ -10,46 -10,50 +10,51 @@@ OC::$CLASSPATH['OCA\Encryption\Session'
  OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
  OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
  
- OC_FileProxy::register(new OCA\Encryption\Proxy());
+ if (!OC_Config::getValue('maintenance', false)) {
+       OC_FileProxy::register(new OCA\Encryption\Proxy());
  
- // User related hooks
- OCA\Encryption\Helper::registerUserHooks();
+       // User related hooks
+       OCA\Encryption\Helper::registerUserHooks();
  
- // Sharing related hooks
- OCA\Encryption\Helper::registerShareHooks();
+       // Sharing related hooks
+       OCA\Encryption\Helper::registerShareHooks();
  
- // Filesystem related hooks
- OCA\Encryption\Helper::registerFilesystemHooks();
+       // Filesystem related hooks
+       OCA\Encryption\Helper::registerFilesystemHooks();
  
- stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
+       stream_wrapper_register('crypt', 'OCA\Encryption\Stream');
  
- // check if we are logged in
- if (OCP\User::isLoggedIn()) {
+       // check if we are logged in
+       if (OCP\User::isLoggedIn()) {
  
-       // ensure filesystem is loaded
-       if(!\OC\Files\Filesystem::$loaded) {
-               \OC_Util::setupFS();
-       }
+               // ensure filesystem is loaded
+               if (!\OC\Files\Filesystem::$loaded) {
+                       \OC_Util::setupFS();
+               }
  
-       $view = new OC_FilesystemView('/');
-       $session = new \OCA\Encryption\Session($view);
+               $view = new OC_FilesystemView('/');
+               $session = new \OCA\Encryption\Session($view);
  
-       $user = \OCP\USER::getUser();
-       // check if user has a private key
-       if (
-               !$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
-               && OCA\Encryption\Crypt::mode() === 'server'
-       ) {
++              $user = \OCP\USER::getUser();
+               // check if user has a private key
+               if (
 -                      !$session->getPrivateKey(\OCP\USER::getUser())
++                      !$view->file_exists('/' . $user . '/files_encryption/' . $user . '.private.key')
+                       && OCA\Encryption\Crypt::mode() === 'server'
+               ) {
  
-               // Force the user to log-in again if the encryption key isn't unlocked
-               // (happens when a user is logged in before the encryption app is
-               // enabled)
-               OCP\User::logout();
+                       // Force the user to log-in again if the encryption key isn't unlocked
+                       // (happens when a user is logged in before the encryption app is
+                       // enabled)
+                       OCP\User::logout();
  
-               header("Location: " . OC::$WEBROOT . '/');
+                       header("Location: " . OC::$WEBROOT . '/');
  
-               exit();
+                       exit();
+               }
        }
+ } else {
+       // logout user if we are in maintenance to force re-login
+       OCP\User::logout();
  }
  
  // Register settings scripts

diff --cc apps/files_encryption/hooks/hooks.php
index 4434df8f147791889ef1ac2873b110a77b094b81,0580b713d1a1ef0380b16c127d6519f9671c009f..7698b95cfd36b9c897722df0d37c6fb7d1b544b4
--- 1/apps/files_encryption/hooks/hooks.php
--- 2/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/hooks/hooks.php
@@@ -69,13 -64,16 +69,16 @@@ class Hooks 
  \r
                $session = new \OCA\Encryption\Session($view);\r
  \r
 -              $session->setPrivateKey($privateKey, $params['uid']);\r
 +              $session->setPrivateKey($privateKey);\r
  \r
                // Check if first-run file migration has already been performed\r
-               $migrationCompleted = $util->getMigrationStatus();\r
+               $ready = false;\r
+               if ($util->getMigrationStatus() === Util::MIGRATION_OPEN) {\r
+                       $ready = $util->beginMigration();\r
+               }\r
  \r
                // If migration not yet done\r
-               if (!$migrationCompleted) {\r
+               if ($ready) {\r
  \r
                        $userView = new \OC_FilesystemView('/' . $params['uid']);\r
  \r

diff --cc apps/files_encryption/lib/crypt.php
Simple merge

diff --cc apps/files_encryption/lib/util.php
Simple merge

diff --cc apps/files_encryption/tests/crypt.php
Simple merge