mirror of
https://github.com/Nheko-Reborn/nheko.git
synced 2024-11-25 20:48:52 +03:00
Keep DBUS from blocking
This commit is contained in:
parent
b51bf6748b
commit
70a4e1e265
1 changed files with 48 additions and 40 deletions
|
@ -2,9 +2,11 @@
|
||||||
|
|
||||||
#include <QDebug>
|
#include <QDebug>
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include <QtDBus/QDBusConnection>
|
#include <QDBusConnection>
|
||||||
#include <QtDBus/QDBusMessage>
|
#include <QDBusMessage>
|
||||||
#include <QtDBus/QDBusMetaType>
|
#include <QDBusMetaType>
|
||||||
|
#include <QDBusPendingCallWatcher>
|
||||||
|
#include <QDBusPendingReply>
|
||||||
|
|
||||||
NotificationsManager::NotificationsManager(QObject *parent)
|
NotificationsManager::NotificationsManager(QObject *parent)
|
||||||
: QObject(parent)
|
: QObject(parent)
|
||||||
|
@ -36,6 +38,12 @@ NotificationsManager::NotificationsManager(QObject *parent)
|
||||||
SLOT(notificationReplied(uint, QString)));
|
SLOT(notificationReplied(uint, QString)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This function is based on code from
|
||||||
|
* https://github.com/rohieb/StratumsphereTrayIcon
|
||||||
|
* Copyright (C) 2012 Roland Hieber <rohieb@rohieb.name>
|
||||||
|
* Licensed under the GNU General Public License, version 3
|
||||||
|
*/
|
||||||
void
|
void
|
||||||
NotificationsManager::postNotification(const QString &roomid,
|
NotificationsManager::postNotification(const QString &roomid,
|
||||||
const QString &eventid,
|
const QString &eventid,
|
||||||
|
@ -44,50 +52,50 @@ NotificationsManager::postNotification(const QString &roomid,
|
||||||
const QString &text,
|
const QString &text,
|
||||||
const QImage &icon)
|
const QImage &icon)
|
||||||
{
|
{
|
||||||
uint id = showNotification(roomname, sender + ": " + text, icon);
|
Q_UNUSED(icon)
|
||||||
notificationIds[id] = roomEventId{roomid, eventid};
|
|
||||||
|
QVariantMap hints;
|
||||||
|
hints["image-data"] = sender + ": " + text;
|
||||||
|
hints["sound-name"] = "message-new-instant";
|
||||||
|
QList<QVariant> argumentList;
|
||||||
|
argumentList << "nheko"; // app_name
|
||||||
|
argumentList << (uint)0; // replace_id
|
||||||
|
argumentList << ""; // app_icon
|
||||||
|
argumentList << roomname; // summary
|
||||||
|
argumentList << text; // body
|
||||||
|
// The list of actions has always the action name and then a localized version of that
|
||||||
|
// action. Currently we just use an empty string for that.
|
||||||
|
// TODO(Nico): Look into what to actually put there.
|
||||||
|
argumentList << (QStringList("default") << ""
|
||||||
|
<< "inline-reply"
|
||||||
|
<< ""); // actions
|
||||||
|
argumentList << hints; // hints
|
||||||
|
argumentList << (int)-1; // timeout in ms
|
||||||
|
|
||||||
|
static QDBusInterface notifyApp("org.freedesktop.Notifications",
|
||||||
|
"/org/freedesktop/Notifications",
|
||||||
|
"org.freedesktop.Notifications");
|
||||||
|
auto call =
|
||||||
|
notifyApp.callWithArgumentList(QDBus::AutoDetect, "Notify", argumentList);
|
||||||
|
QDBusPendingCallWatcher watcher{QDBusPendingReply{call}};
|
||||||
|
connect(&watcher, &QDBusPendingCallWatcher::finished, this, [&watcher, this, &roomid, &eventid]() {
|
||||||
|
if (watcher.reply().type() == QDBusMessage::ErrorMessage)
|
||||||
|
qDebug() << "D-Bus Error:" << watcher.reply().errorMessage();
|
||||||
|
else
|
||||||
|
notificationIds[watcher.reply().arguments().first().toUInt()] = roomEventId{roomid, eventid};
|
||||||
|
});
|
||||||
}
|
}
|
||||||
/**
|
|
||||||
* This function is based on code from
|
|
||||||
* https://github.com/rohieb/StratumsphereTrayIcon
|
|
||||||
* Copyright (C) 2012 Roland Hieber <rohieb@rohieb.name>
|
|
||||||
* Licensed under the GNU General Public License, version 3
|
|
||||||
*/
|
|
||||||
uint
|
uint
|
||||||
NotificationsManager::showNotification(const QString summary,
|
NotificationsManager::showNotification(const QString summary,
|
||||||
const QString text,
|
const QString text,
|
||||||
const QImage image)
|
const QImage image)
|
||||||
{
|
{
|
||||||
QVariantMap hints;
|
Q_UNUSED(summary)
|
||||||
hints["image-data"] = image;
|
Q_UNUSED(text)
|
||||||
hints["sound-name"] = "message-new-instant";
|
Q_UNUSED(image)
|
||||||
QList<QVariant> argumentList;
|
|
||||||
argumentList << "nheko"; // app_name
|
|
||||||
argumentList << (uint)0; // replace_id
|
|
||||||
argumentList << ""; // app_icon
|
|
||||||
argumentList << summary; // summary
|
|
||||||
argumentList << text; // body
|
|
||||||
// The list of actions has always the action name and then a localized version of that
|
|
||||||
// action. Currently we just use an empty string for that.
|
|
||||||
// TODO(Nico): Look into what to actually put there.
|
|
||||||
argumentList << (QStringList("default") << ""
|
|
||||||
<< "inline-reply"
|
|
||||||
<< ""); // actions
|
|
||||||
argumentList << hints; // hints
|
|
||||||
argumentList << (int)-1; // timeout in ms
|
|
||||||
|
|
||||||
static QDBusInterface notifyApp("org.freedesktop.Notifications",
|
return 0;
|
||||||
"/org/freedesktop/Notifications",
|
|
||||||
"org.freedesktop.Notifications");
|
|
||||||
QDBusMessage reply =
|
|
||||||
notifyApp.callWithArgumentList(QDBus::AutoDetect, "Notify", argumentList);
|
|
||||||
if (reply.type() == QDBusMessage::ErrorMessage) {
|
|
||||||
qDebug() << "D-Bus Error:" << reply.errorMessage();
|
|
||||||
return 0;
|
|
||||||
} else {
|
|
||||||
return reply.arguments().first().toUInt();
|
|
||||||
}
|
|
||||||
return true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
|
Loading…
Reference in a new issue