Merge pull request #15675 from owncloud/enc_error_messages

[encryption] display warning if password changed or if the keys are not initialized

diff --cc apps/encryption/appinfo/app.php
index 0e8ce56227b807186b7b4333b40c9236b42700b1,cbc50e683e60922f5309c5855e9e196e68e9c297..0c7c231aef7fd4542d1a9fb231f1d52d6c6aa678
--- 1/apps/encryption/appinfo/app.php
--- 2/apps/encryption/appinfo/app.php
+++ b/apps/encryption/appinfo/app.php
@@@ -23,9 -23,9 +23,11 @@@
  
  namespace OCA\Encryption\AppInfo;
  
+ \OCP\Util::addscript('encryption', 'encryption');
+ 
  $app = new Application();
 -$app->registerEncryptionModule();
 -$app->registerHooks();
 -$app->registerSettings();
 +if (\OC::$server->getEncryptionManager()->isReady()) {
 +      $app->registerEncryptionModule();
 +      $app->registerHooks();
 +      $app->registerSettings();
 +}

diff --cc apps/encryption/appinfo/application.php
Simple merge

diff --cc apps/encryption/lib/keymanager.php
Simple merge