2 files changed, 8 insertions, 19 deletions

diff --git a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
index 12959f57e9b..c521329e203 100644
--- a/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
+++ b/apps/twofactor_backupcodes/lib/Provider/BackupCodesProvider.php
@@ -11,35 +11,24 @@ namespace OCA\TwoFactorBackupCodes\Provider;
 use OC\App\AppManager;
 use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
 use OCA\TwoFactorBackupCodes\Settings\Personal;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\Authentication\TwoFactorAuth\IDeactivatableByAdmin;
 use OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings;
 use OCP\Authentication\TwoFactorAuth\IProvidesPersonalSettings;
-use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IUser;
 use OCP\Template\ITemplate;
 use OCP\Template\ITemplateManager;
 
 class BackupCodesProvider implements IDeactivatableByAdmin, IProvidesPersonalSettings {
-
-	/** @var AppManager */
-	private $appManager;
-
-	/**
-	 * @param string $appName
-	 * @param BackupCodeStorage $storage
-	 * @param IL10N $l10n
-	 * @param AppManager $appManager
-	 */
 	public function __construct(
 		private string $appName,
 		private BackupCodeStorage $storage,
 		private IL10N $l10n,
-		AppManager $appManager,
-		private IInitialStateService $initialStateService,
+		private AppManager $appManager,
+		private IInitialState $initialState,
 		private ITemplateManager $templateManager,
 	) {
-		$this->appManager = $appManager;
 	}
 
 	/**
@@ -131,11 +120,11 @@ class BackupCodesProvider implements IDeactivatableByAdmin, IProvidesPersonalSet
 	 */
 	public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
 		$state = $this->storage->getBackupCodesState($user);
-		$this->initialStateService->provideInitialState($this->appName, 'state', $state);
+		$this->initialState->provideInitialState('state', $state);
 		return new Personal();
 	}
 
-	public function disableFor(IUser $user) {
+	public function disableFor(IUser $user): void {
 		$this->storage->deleteCodes($user);
 	}
 }
diff --git a/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php b/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
index cef3e07a36e..512374fca8c 100644
--- a/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
+++ b/apps/twofactor_backupcodes/tests/Unit/Provider/BackupCodesProviderTest.php
@@ -11,7 +11,7 @@ namespace OCA\TwoFactorBackupCodes\Tests\Unit\Provider;
 use OC\App\AppManager;
 use OCA\TwoFactorBackupCodes\Provider\BackupCodesProvider;
 use OCA\TwoFactorBackupCodes\Service\BackupCodeStorage;
-use OCP\IInitialStateService;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IL10N;
 use OCP\IUser;
 use OCP\Server;
@@ -25,7 +25,7 @@ class BackupCodesProviderTest extends TestCase {
 	private BackupCodeStorage&MockObject $storage;
 	private IL10N&MockObject $l10n;
 	private AppManager&MockObject $appManager;
-	private IInitialStateService&MockObject $initialState;
+	private IInitialState&MockObject $initialState;
 
 	private ITemplateManager $templateManager;
 	private BackupCodesProvider $provider;
@@ -37,7 +37,7 @@ class BackupCodesProviderTest extends TestCase {
 		$this->storage = $this->createMock(BackupCodeStorage::class);
 		$this->l10n = $this->createMock(IL10N::class);
 		$this->appManager = $this->createMock(AppManager::class);
-		$this->initialState = $this->createMock(IInitialStateService::class);
+		$this->initialState = $this->createMock(IInitialState::class);
 		$this->templateManager = Server::get(ITemplateManager::class);
 
 		$this->provider = new BackupCodesProvider(