fixup! fix: generate favourite icon without imagick svg support

Signed-off-by: SebastianKrupinski <[email protected]>

Author: SebastianKrupinski

apps/theming/lib/Controller/IconController.php

@@ -97,13 +97,13 @@ public function getFavicon(string $app = 'core'): Response {
 
 		$response = null;
 		$iconFile = null;
-		// retrieve instance favorite icon
+		// retrieve instance favicon
 		try {
 			$iconFile = $this->imageManager->getImage('favicon', false);
 			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
 		} catch (NotFoundException $e) {
 		}
-		// retrieve or generate app specific favorite icon
+		// retrieve or generate app specific favicon
 		if (($this->imageManager->canConvert('PNG') || $this->imageManager->canConvert('SVG')) && $this->imageManager->canConvert('ICO')) {
 			$color = $this->themingDefaults->getColorPrimary();
 			try {
@@ -117,7 +117,7 @@ public function getFavicon(string $app = 'core'): Response {
 			}
 			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
 		}
-		// fallback to core favorite icon
+		// fallback to core favicon
 		if ($response === null) {
 			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
 			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
@@ -145,7 +145,7 @@ public function getTouchIcon(string $app = 'core'): Response {
 		}
 
 		$response = null;
-		// retrieve instance favorite icon
+		// retrieve instance favicon
 		try {
 			$iconFile = $this->imageManager->getImage('favicon');
 			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => $iconFile->getMimeType()]);

apps/theming/lib/IconBuilder.php

@@ -114,24 +114,23 @@ public function renderAppIcon($app, $size) {
 		if ($appIconContent === false || $appIconContent === '') {
 			return false;
 		}
-
-		$appIconFile = null;
-		$appIconIsSvg = ($mime === 'image/svg+xml' || substr($appIconContent, 0, 4) === '<svg');
-
-		// if source image is svg but svg not supported, abort
+		
+		$appIconIsSvg = ($mime === 'image/svg+xml' || str_starts_with($appIconContent, '<svg') || str_starts_with($appIconContent, '<?xml'));
+		// if source image is svg but svg not supported, abort.
+		// source images are both user and developer set, and there is guarantees that mime and extension match actual contents type
 		if ($appIconIsSvg && !$supportSvg) {
 			return false;
 		}
 
+		// construct original image object
 		try {
-			// construct original image object
 			$appIconFile = new Imagick();
 			$appIconFile->setBackgroundColor(new ImagickPixel('transparent'));
 
 			if ($appIconIsSvg) {
 				// handle SVG images
 				// ensure proper XML declaration
-				if (substr($appIconContent, 0, 5) !== '<?xml') {
+				if (str_starts_with($appIconContent, '<?xml')) {
 					$svg = '<?xml version="1.0"?>' . $appIconContent;
 				} else {
 					$svg = $appIconContent;

apps/theming/lib/ImageManager.php

@@ -391,7 +391,7 @@ public function shouldReplaceIcons() {
 	 *
 	 * @return bool
 	 */
-	public function canConvert(string $format = 'SVG'): bool {
+	public function canConvert(string $format): bool {
 		$cache = $this->cacheFactory->createDistributed('theming-' . $this->urlGenerator->getBaseUrl());
 		if ($value = $cache->get('convert-' . $format)) {
 			return (bool)$value;

apps/theming/lib/Util.php

@@ -211,24 +211,16 @@ public function getAppIcon($app, $useSvg = true) {
 		try {
 			// find app specific icon
 			$appPath = $this->appManager->getAppPath($app);
-			if ($useSvg) {
-				$icon = $appPath . '/img/' . $app . '.svg';
-				if (file_exists($icon)) {
-					return $icon;
-				}
-				$icon = $appPath . '/img/app.svg';
-				if (file_exists($icon)) {
-					return $icon;
-				}
-			} else {
-				$icon = $appPath . '/img/' . $app . '.png';
-				if (file_exists($icon)) {
-					return $icon;
-				}
-				$icon = $appPath . '/img/app.png';
-				if (file_exists($icon)) {
-					return $icon;
-				}
+			$extension = ($useSvg ? '.svg' : '.png');
+
+			$icon = $appPath . '/img/' . $app . $extension;
+			if (file_exists($icon)) {
+				return $icon;
+			}
+			
+			$icon = $appPath . '/img/app' . $extension;
+			if (file_exists($icon)) {
+				return $icon;
 			}
 		} catch (AppPathNotFoundException $e) {
 		}
@@ -242,11 +234,9 @@ public function getAppIcon($app, $useSvg = true) {
 		}
 		// fallback to core logo
 		if ($useSvg) {
-			$icon = \OC::$SERVERROOT . '/core/img/logo/logo.svg';
-			return $icon;
+			return \OC::$SERVERROOT . '/core/img/logo/logo.svg';
 		} else {
-			$icon = \OC::$SERVERROOT . '/core/img/logo/logo.png';
-			return $icon;
+			return \OC::$SERVERROOT . '/core/img/logo/logo.png';
 		}
 	}