Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules

Issue/15694 display name of encryption modules

3 files changed, 7 insertions, 7 deletions

diff --git a/apps/encryption_dummy/appinfo/app.php b/apps/encryption_dummy/appinfo/app.php
index fa17e676eda..f04886f9f1f 100644
--- a/apps/encryption_dummy/appinfo/app.php
+++ b/apps/encryption_dummy/appinfo/app.php
@@ -2,5 +2,5 @@
 
 $manager = \OC::$server->getEncryptionManager();
 $module = new \OCA\Encryption_Dummy\DummyModule();
-$manager->registerEncryptionModule($module);
+$manager->registerEncryptionModule('OC_DUMMY_MODULE', 'Dummy Encryption Module', $module);
 
diff --git a/lib/private/encryption/manager.php b/lib/private/encryption/manager.php
index e01054c92a4..7a3f17519fc 100644
--- a/lib/private/encryption/manager.php
+++ b/lib/private/encryption/manager.php
@@ -106,11 +106,11 @@ class Manager implements IManager {
 			$this->setDefaultEncryptionModule($id);
 		}
 
-		$this->encryptionModules[$id] = array(
+		$this->encryptionModules[$id] = [
 			'id' => $id,
-			'displayName' => 'displayName',
-			'callback' => $callback
-		);
+			'displayName' => $displayName,
+			'callback' => $callback,
+		];
 	}
 
 	/**
diff --git a/settings/admin.php b/settings/admin.php
index 773e8276534..94e48aab14e 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -92,13 +92,13 @@ try {
 	$defaultEncryptionModule = \OC::$server->getEncryptionManager()->getDefaultEncryptionModule();
 	$defaultEncryptionModuleId = $defaultEncryptionModule->getId();
 } catch (Exception $e) {
-	$defaultEncryptionModule = null;
+	$defaultEncryptionModuleId = null;
 }
 $encModulues = array();
 foreach ($encryptionModules as $module) {
 	$encModulues[$module['id']]['displayName'] = $module['displayName'];
 	$encModulues[$module['id']]['default'] = false;
-	if ($defaultEncryptionModule && $module['id'] === $defaultEncryptionModuleId) {
+	if ($module['id'] === $defaultEncryptionModuleId) {
 		$encModulues[$module['id']]['default'] = true;
 	}
 }