Fix activating browser windows on Wayland

QDesktopServices::openUrl does not have XDG activation support yet so it can't raise an existing browser window when opening URLs

Instead use KIO::OpenUrlJob, which does support that

src/CMakeLists.txt

@@ -36,6 +36,7 @@ add_executable(neochat
     blurhashimageprovider.cpp
     joinrulesevent.cpp
     collapsestateproxymodel.cpp
+    urlhelper.cpp
     ../res.qrc
 )
 

src/main.cpp

@@ -69,6 +69,7 @@
 #include "roomlistmodel.h"
 #include "roommanager.h"
 #include "sortfilterroomlistmodel.h"
+#include "urlhelper.h"
 #include "userdirectorylistmodel.h"
 #include "userlistmodel.h"
 #include "webshortcutmodel.h"
@@ -175,6 +176,7 @@ int main(int argc, char *argv[])
 
     Login *login = new Login();
     ChatBoxHelper chatBoxHelper;
+    UrlHelper urlHelper;
 
 #ifdef HAVE_COLORSCHEME
     ColorSchemer colorScheme;
@@ -191,6 +193,7 @@ int main(int argc, char *argv[])
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "FileType", &fileTypeSingleton);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "LoginHelper", login);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "ChatBoxHelper", &chatBoxHelper);
+    qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "UrlHelper", &urlHelper);
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "EmojiModel", new EmojiModel(&app));
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "CommandModel", new CommandModel(&app));
     qmlRegisterSingletonInstance("org.kde.neochat", 1, 0, "AccountRegistry", &Quotient::AccountRegistry::instance());

src/roommanager.cpp

@@ -13,6 +13,10 @@
 #include <csapi/joining.h>
 #include <utility>
 
+#ifndef Q_OS_ANDROID
+#include <KIO/OpenUrlJob>
+#endif
+
 RoomManager::RoomManager(QObject *parent)
     : QObject(parent)
     , m_currentRoom(nullptr)
@@ -191,9 +195,19 @@ void RoomManager::joinRoom(Quotient::Connection *account, const QString &roomAli
 
 bool RoomManager::visitNonMatrix(const QUrl &url)
 {
+#ifdef Q_OS_ANDROID
     if (!QDesktopServices::openUrl(url)) {
         Q_EMIT warning(i18n("No application for the link"), i18n("Your operating system could not find an application for the link."));
     }
+#else
+    auto *job = new KIO::OpenUrlJob(url);
+    connect(job, &KJob::finished, this, [this](KJob *job) {
+        if (job->error()) {
+            Q_EMIT warning(i18n("Could not open URL"), job->errorString());
+        }
+    });
+    job->start();
+#endif
     return true;
 }
 

src/urlhelper.cpp

@@ -0,0 +1,24 @@
+// SPDX-FileCopyrightText: 2022 Nicolas Fella <nicolas.fella@gmx.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include "urlhelper.h"
+
+#include <QtGlobal>
+
+#ifdef Q_OS_ANDROID
+#include <QDesktopServices>
+#else
+#include <KIO/OpenUrlJob>
+#endif
+
+// QDesktopServices::openUrl doesn't support XDG activation yet, OpenUrlJob does
+// On Android XDG activation is not relevant, so use QDesktopServices::openUrl to avoid the heavy KIO dependency
+void UrlHelper::openUrl(const QUrl &url)
+{
+#ifdef Q_OS_ANDROID
+    QDesktopServices::openUrl(url);
+#else
+    auto *job = new KIO::OpenUrlJob(url);
+    job->start();
+#endif
+}

src/urlhelper.h

@@ -0,0 +1,13 @@
+// SPDX-FileCopyrightText: 2022 Nicolas Fella <nicolas.fella@gmx.de>
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+#include <QObject>
+
+class UrlHelper : public QObject
+{
+    Q_OBJECT
+public:
+    Q_INVOKABLE void openUrl(const QUrl &url);
+};