From e7fcf1550ffc2d413424595c990e7bd652300318 Mon Sep 17 00:00:00 2001
From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Wed, 25 Mar 2026 16:04:42 +0100
Subject: [PATCH 1/5] refactor(asyncimageresponse): use Qt::StringLiterals

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---
 src/gui/tray/asyncimageresponse.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/gui/tray/asyncimageresponse.cpp b/src/gui/tray/asyncimageresponse.cpp
index 26965619ab79f..cddc6700eabb4 100644
--- a/src/gui/tray/asyncimageresponse.cpp
+++ b/src/gui/tray/asyncimageresponse.cpp
@@ -11,6 +11,8 @@
 
 #include "accountmanager.h"
 
+using namespace Qt::StringLiterals;
+
 AsyncImageResponse::AsyncImageResponse(const QString &id, const QSize &requestedSize)
 {
     if (id.isEmpty()) {
@@ -19,7 +21,7 @@ AsyncImageResponse::AsyncImageResponse(const QString &id, const QSize &requested
     }
 
     auto actualId = id;
-    const auto idSplit = id.split(QStringLiteral("/"), Qt::SkipEmptyParts);
+    const auto idSplit = id.split('/'_L1, Qt::SkipEmptyParts);
     const auto color = QColor(idSplit.last());
 
     if(color.isValid()) {
@@ -27,7 +29,7 @@ AsyncImageResponse::AsyncImageResponse(const QString &id, const QSize &requested
         actualId.remove("/" % idSplit.last());
     }
 
-    _imagePaths = actualId.split(QLatin1Char(';'), Qt::SkipEmptyParts);
+    _imagePaths = actualId.split(';'_L1, Qt::SkipEmptyParts);
     _requestedImageSize = requestedSize;
 
     if (_imagePaths.isEmpty()) {
@@ -56,10 +58,10 @@ void AsyncImageResponse::processNextImage()
     }
 
     const auto imagePath = _imagePaths.at(_index);
-    if (imagePath.startsWith(QStringLiteral(":/client"))) {
+    if (imagePath.startsWith(u":/client"_s)) {
         setImageAndEmitFinished(QIcon(imagePath).pixmap(_requestedImageSize).toImage());
         return;
-    } else if (imagePath.startsWith(QStringLiteral(":/fileicon"))) {
+    } else if (imagePath.startsWith(u":/fileicon"_s)) {
         const auto filePath = imagePath.mid(10);
         const auto fileInfo = QFileInfo(filePath);
         setImageAndEmitFinished(_fileIconProvider.icon(fileInfo).pixmap(_requestedImageSize).toImage());
@@ -83,7 +85,7 @@ void AsyncImageResponse::processNextImage()
             // for some reason trying to use `accountInRequestedServer` causes clang 21 to crash for me :(
             const auto accountQnam = accountInRequestedServer->networkAccessManager();
             QMetaObject::invokeMethod(accountQnam, [this, accountInRequestedServer, iconUrl]() -> void {
-                const auto reply = accountInRequestedServer->sendRawRequest(QByteArrayLiteral("GET"), iconUrl);
+                const auto reply = accountInRequestedServer->sendRawRequest("GET"_ba, iconUrl);
                 connect(reply, &QNetworkReply::finished, this, [this, reply]() -> void {
                     QMetaObject::invokeMethod(this, [this, reply]() -> void {
                         processNetworkReply(reply);
@@ -109,10 +111,10 @@ void AsyncImageResponse::processNetworkReply(QNetworkReply *reply)
     const QByteArray imageData = reply->readAll();
     // server returns "[]" for some some file previews (have no idea why), so, we use another image
     // from the list if available
-    if (imageData.isEmpty() || imageData == QByteArrayLiteral("[]")) {
+    if (imageData.isEmpty() || imageData == "[]"_ba) {
         processNextImage();
     } else {
-        if (imageData.startsWith(QByteArrayLiteral("<svg"))) {
+        if (imageData.startsWith("<svg"_ba)) {
             // SVG image needs proper scaling, let's do it with QPainter and QSvgRenderer
             QSvgRenderer svgRenderer;
             if (svgRenderer.load(imageData)) {

From 4278f60e4777c9e620a774b879d5eaefcaf7a790 Mon Sep 17 00:00:00 2001
From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Wed, 25 Mar 2026 16:06:24 +0100
Subject: [PATCH 2/5] refactor(asyncimageresponse): use early returns where
 possible

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---
 src/gui/tray/asyncimageresponse.cpp | 58 +++++++++++++++--------------
 1 file changed, 30 insertions(+), 28 deletions(-)

diff --git a/src/gui/tray/asyncimageresponse.cpp b/src/gui/tray/asyncimageresponse.cpp
index cddc6700eabb4..c25c37c7b9e8a 100644
--- a/src/gui/tray/asyncimageresponse.cpp
+++ b/src/gui/tray/asyncimageresponse.cpp
@@ -113,34 +113,36 @@ void AsyncImageResponse::processNetworkReply(QNetworkReply *reply)
     // from the list if available
     if (imageData.isEmpty() || imageData == "[]"_ba) {
         processNextImage();
-    } else {
-        if (imageData.startsWith("<svg"_ba)) {
-            // SVG image needs proper scaling, let's do it with QPainter and QSvgRenderer
-            QSvgRenderer svgRenderer;
-            if (svgRenderer.load(imageData)) {
-                QImage scaledSvg(_requestedImageSize, QImage::Format_ARGB32);
-                scaledSvg.fill("transparent");
-                QPainter painterForSvg(&scaledSvg);
-                svgRenderer.render(&painterForSvg);
-
-                if(!_svgRecolor.isValid()) {
-                    setImageAndEmitFinished(scaledSvg);
-                    return;
-                }
-
-                QImage image(_requestedImageSize, QImage::Format_ARGB32);
-                image.fill(_svgRecolor);
-                QPainter imagePainter(&image);
-                imagePainter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-                imagePainter.drawImage(0, 0, scaledSvg);
-                setImageAndEmitFinished(image);
-                return;
-            } else {
-                processNextImage();
-            }
-        } else {
-            setImageAndEmitFinished(QImage::fromData(imageData));
-        }
+        return;
+    }
+
+    if (!imageData.startsWith("<svg"_ba)) {
+        setImageAndEmitFinished(QImage::fromData(imageData));
+        return;
     }
+
+    // SVG image needs proper scaling, let's do it with QPainter and QSvgRenderer
+    QSvgRenderer svgRenderer;
+    if (!svgRenderer.load(imageData)) {
+        processNextImage();
+        return;
+    }
+
+    QImage scaledSvg(_requestedImageSize, QImage::Format_ARGB32);
+    scaledSvg.fill("transparent");
+    QPainter painterForSvg(&scaledSvg);
+    svgRenderer.render(&painterForSvg);
+
+    if (!_svgRecolor.isValid()) {
+        setImageAndEmitFinished(scaledSvg);
+        return;
+    }
+
+    QImage image(_requestedImageSize, QImage::Format_ARGB32);
+    image.fill(_svgRecolor);
+    QPainter imagePainter(&image);
+    imagePainter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
+    imagePainter.drawImage(0, 0, scaledSvg);
+    setImageAndEmitFinished(image);
 }
 

From af67146fdc35cdb99f1d8c218aad54e739abab39 Mon Sep 17 00:00:00 2001
From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Wed, 25 Mar 2026 16:31:35 +0100
Subject: [PATCH 3/5] fix(asyncimageresponse): enhance check for received SVG
 response

Some SVG files do not start with `<svg`, but with `<?xml` and could include
some additional metadata (e.g. a generator comment or licence header ...)

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---
 src/gui/tray/asyncimageresponse.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/gui/tray/asyncimageresponse.cpp b/src/gui/tray/asyncimageresponse.cpp
index c25c37c7b9e8a..3a514d2111e2f 100644
--- a/src/gui/tray/asyncimageresponse.cpp
+++ b/src/gui/tray/asyncimageresponse.cpp
@@ -116,7 +116,12 @@ void AsyncImageResponse::processNetworkReply(QNetworkReply *reply)
         return;
     }
 
-    if (!imageData.startsWith("<svg"_ba)) {
+    // check whether the reply might be an SVG by looking at the content type and the first 512 bytes of the response for `<svg`.
+    // Some graphics programs export SVGs that begin with `<?xml version="1.0" [...]` and/or include some comments after that (e.g.
+    // `<!-- Generator: ...`), so we can't rely on just the response to start with `<svg`.
+    if (const auto contentTypeHeader = reply->header(QNetworkRequest::ContentTypeHeader);
+        !(contentTypeHeader.toString().startsWith("image/svg"_ba) || imageData.first(qMin(imageData.size(), 512)).contains("<svg"_ba))) {
+        // Not an SVG: let's let QImage deal with the response.
         setImageAndEmitFinished(QImage::fromData(imageData));
         return;
     }

From 3bf7b61b03cbc87094cd637f3ff097bdc400963f Mon Sep 17 00:00:00 2001
From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Wed, 25 Mar 2026 16:38:03 +0100
Subject: [PATCH 4/5] fix(asyncimageresponse): scale QImage to requested size

this may cause an infinite re-request loop if the layout does not match

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---
 src/gui/tray/asyncimageresponse.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/tray/asyncimageresponse.cpp b/src/gui/tray/asyncimageresponse.cpp
index 3a514d2111e2f..034639fcde6db 100644
--- a/src/gui/tray/asyncimageresponse.cpp
+++ b/src/gui/tray/asyncimageresponse.cpp
@@ -122,7 +122,7 @@ void AsyncImageResponse::processNetworkReply(QNetworkReply *reply)
     if (const auto contentTypeHeader = reply->header(QNetworkRequest::ContentTypeHeader);
         !(contentTypeHeader.toString().startsWith("image/svg"_ba) || imageData.first(qMin(imageData.size(), 512)).contains("<svg"_ba))) {
         // Not an SVG: let's let QImage deal with the response.
-        setImageAndEmitFinished(QImage::fromData(imageData));
+        setImageAndEmitFinished(QImage::fromData(imageData).scaled(_requestedImageSize));
         return;
     }
 

From a8f2cd269898c5e0fc965e63416b23df38419883 Mon Sep 17 00:00:00 2001
From: Jyrki Gadinger <nilsding@nilsding.org>
Date: Thu, 26 Mar 2026 13:25:31 +0100
Subject: [PATCH 5/5] refactor(asyncimageresponse): use QMimeDatabase for SVG
 check

Signed-off-by: Jyrki Gadinger <nilsding@nilsding.org>
---
 src/gui/tray/asyncimageresponse.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gui/tray/asyncimageresponse.cpp b/src/gui/tray/asyncimageresponse.cpp
index 034639fcde6db..875a2d16eb755 100644
--- a/src/gui/tray/asyncimageresponse.cpp
+++ b/src/gui/tray/asyncimageresponse.cpp
@@ -6,6 +6,7 @@
 #include "asyncimageresponse.h"
 
 #include <QIcon>
+#include <QMimeDatabase>
 #include <QPainter>
 #include <QSvgRenderer>
 
@@ -116,11 +117,10 @@ void AsyncImageResponse::processNetworkReply(QNetworkReply *reply)
         return;
     }
 
-    // check whether the reply might be an SVG by looking at the content type and the first 512 bytes of the response for `<svg`.
     // Some graphics programs export SVGs that begin with `<?xml version="1.0" [...]` and/or include some comments after that (e.g.
     // `<!-- Generator: ...`), so we can't rely on just the response to start with `<svg`.
-    if (const auto contentTypeHeader = reply->header(QNetworkRequest::ContentTypeHeader);
-        !(contentTypeHeader.toString().startsWith("image/svg"_ba) || imageData.first(qMin(imageData.size(), 512)).contains("<svg"_ba))) {
+    if (const auto mimetype = QMimeDatabase().mimeTypeForData(imageData);
+        !(mimetype.isValid() && mimetype.inherits("image/svg+xml"_L1))) {
         // Not an SVG: let's let QImage deal with the response.
         setImageAndEmitFinished(QImage::fromData(imageData).scaled(_requestedImageSize));
         return;