Updates inverted logo handling to work like the app icons

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>

1 files changed, 1 insertions, 20 deletions

diff --git a/apps/theming/lib/ThemingDefaults.php b/apps/theming/lib/ThemingDefaults.php
index 7a26b46516f..0573f7b84d7 100644
--- a/apps/theming/lib/ThemingDefaults.php
+++ b/apps/theming/lib/ThemingDefaults.php
@@ -33,7 +33,6 @@
 
 namespace OCA\Theming;
 
-
 use OCP\App\AppPathNotFoundException;
 use OCP\App\IAppManager;
 use OCP\Files\NotFoundException;
@@ -275,7 +274,7 @@ class ThemingDefaults extends \OC_Defaults {
 			'theming-favicon-mime' => "'" . $this->config->getAppValue('theming', 'faviconMime') . "'"
 		];
 
-		$variables['image-logo'] = "url('". $this->getLogoUrl() ."')";
+		$variables['image-logo'] = "url('".$this->imageManager->getImageUrl('logo')."')";
 		$variables['image-logoheader'] = "'".$this->imageManager->getImageUrl('logoheader')."'";
 		$variables['image-favicon'] = "'".$this->imageManager->getImageUrl('favicon')."'";
 		$variables['image-login-background'] = "url('".$this->imageManager->getImageUrl('background')."')";
@@ -301,24 +300,6 @@ class ThemingDefaults extends \OC_Defaults {
 	}
 
 	/**
-	 * Returns the logo url.
-	 * If there is a custom logo, it just returns it.
-	 * For the default logo it returns the white or blue one depending on the color luminance.
-	 *
-	 * @return string
-	 */
-	private function getLogoUrl() {
-		$logoMime = $this->config->getAppValue('theming', 'logoMime');
-		$primaryColor = $this->getColorPrimary();
-		$luminance = $this->util->calculateLuminance($primaryColor);
-		if ($logoMime === '' & $luminance > 0.8) {
-			return $this->imageManager->getImageUrl('logo-blue', true);
-		} else {
-			return $this->imageManager->getImageUrl('logo', true);
-		}
-	}
-
-	/**
 	 * Check if the image should be replaced by the theming app
 	 * and return the new image location then
 	 *