Remove OCP\App and OCP\BackgroundJob

Both deprecated since NC 23

IAppManager is the replacement for OCP\App unfortunately it can't be
dependency injected in classes used by the installed otherwise the
database connection is initialised too early

Signed-off-by: Carl Schwan <carl@carlschwan.eu>

2 files changed, 7 insertions, 4 deletions

diff --git a/core/Command/Maintenance/Repair.php b/core/Command/Maintenance/Repair.php
index aa0f6a2a086..2c1fda7c8e4 100644
--- a/core/Command/Maintenance/Repair.php
+++ b/core/Command/Maintenance/Repair.php
@@ -82,7 +82,7 @@ class Repair extends Command {
 			if (!$this->appManager->isEnabledForUser($app)) {
 				continue;
 			}
-			$info = \OC_App::getAppInfo($app);
+			$info = $this->appManager->getAppInfo($app);
 			if (!is_array($info)) {
 				continue;
 			}
diff --git a/core/Command/User/ResetPassword.php b/core/Command/User/ResetPassword.php
index 21bc5cc45b0..294cea38b71 100644
--- a/core/Command/User/ResetPassword.php
+++ b/core/Command/User/ResetPassword.php
@@ -28,6 +28,7 @@
 namespace OC\Core\Command\User;
 
 use OC\Core\Command\Base;
+use OCP\App\IAppManager;
 use OCP\IUser;
 use OCP\IUserManager;
 use Stecman\Component\Symfony\Console\BashCompletion\CompletionContext;
@@ -41,10 +42,12 @@ use Symfony\Component\Console\Question\Question;
 
 class ResetPassword extends Base {
 	protected IUserManager $userManager;
+	private IAppManager $appManager;
 
-	public function __construct(IUserManager $userManager) {
-		$this->userManager = $userManager;
+	public function __construct(IUserManager $userManager, IAppManager $appManager) {
 		parent::__construct();
+		$this->userManager = $userManager;
+		$this->appManager = $appManager;
 	}
 
 	protected function configure() {
@@ -84,7 +87,7 @@ class ResetPassword extends Base {
 			/** @var QuestionHelper $helper */
 			$helper = $this->getHelper('question');
 
-			if (\OCP\App::isEnabled('encryption')) {
+			if ($this->appManager->isEnabledForUser('encryption', $user)) {
 				$output->writeln(
 					'<error>Warning: Resetting the password when using encryption will result in data loss!</error>'
 				);