18.0.0 Beta1 - Encryption error (fix included)

[MartB]

Hey there, i get the following log on the latest beta

TypeError: Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an instance of OCA\Encryption\KeyManager, instance of OC\Security\SecureRandom given, called in /usr/share/nginx/c/apps/encryption/lib/AppInfo/Application.php on line 173

Did i break something or what do i have to do to get rid of this?

Additionally i always get this:
Encryption App is enabled, but your keys are not initialized. Please log-out and log-in again.

[MartB]

This is caused by the wrong order of constructor arguments here:

server/apps/encryption/lib/AppInfo/Application.php

Lines 167 to 176 in 63a2725

	return new Recovery(
	$server->getUserSession(),
	$c->query('Crypt'),
	$server->getSecureRandom(),
	$c->query('KeyManager'),
	$server->getConfig(),
	$server->getEncryptionKeyStorage(),
	$server->getEncryptionFilesHelper(),
	new View());
	});

compared to here:

server/apps/encryption/lib/Recovery.php

Lines 76 to 81 in 63a2725

	public function __construct(IUserSession $userSession,
	Crypt $crypt,
	KeyManager $keyManager,
	IConfig $config,
	IFile $file,
	View $view) {

sadly my internet is too bad to clone the repo right now, so yeah feel free to grab an easy fix.

[kesselb]

Regression from #15936