From 7d6d65600ef432f440d354789fa48c9dd5013f40 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Tue, 13 Sep 2022 17:28:40 +0200
Subject: [PATCH] Fix twofactor provider icons in dark mode

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 .../lib/Settings/Personal/Security/TwoFactor.php     |  1 -
 .../settings/personal/security/twofactor.php         | 12 ++----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
index 726fc99943a70..c356442a6280e 100644
--- a/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
+++ b/apps/settings/lib/Settings/Personal/Security/TwoFactor.php
@@ -72,7 +72,6 @@ public function __construct(ProviderLoader $providerLoader,
 	public function getForm(): TemplateResponse {
 		return new TemplateResponse('settings', 'settings/personal/security/twofactor', [
 			'twoFactorProviderData' => $this->getTwoFactorProviderData(),
-			'themedark' => $this->config->getUserValue($this->uid, 'accessibility', 'theme', false)
 		]);
 	}
 
diff --git a/apps/settings/templates/settings/personal/security/twofactor.php b/apps/settings/templates/settings/personal/security/twofactor.php
index 3d85f4505c3bc..3fa63bd6d2878 100644
--- a/apps/settings/templates/settings/personal/security/twofactor.php
+++ b/apps/settings/templates/settings/personal/security/twofactor.php
@@ -40,18 +40,10 @@
 			$provider = $data['provider'];
 			//Handle 2FA provider icons and theme
 			if ($provider instanceof \OCP\Authentication\TwoFactorAuth\IProvidesIcons) {
-				if ($_['themedark']) {
-					$icon = $provider->getLightIcon();
-				} else {
-					$icon = $provider->getDarkIcon();
-				}
+				$icon = $provider->getDarkIcon();
 				//fallback icon if the 2factor provider doesn't provide an icon.
 			} else {
-				if ($_['themedark']) {
-					$icon = image_path('core', 'actions/password-white.svg');
-				} else {
-					$icon = image_path('core', 'actions/password.svg');
-				}
+				$icon = image_path('core', 'actions/password.svg');
 			}
 			/** @var \OCP\Authentication\TwoFactorAuth\IPersonalProviderSettings $settings */
 			$settings = $data['settings'];