e86ea7b3bd
When disabling the notifications plugin, we can't delete the notification adapter due to a QT bug. Thus we leak it, and to not expose the notifications anymore, we clean up the notifications in the adaptor. Therefore we delete the QStrings in the notification hashmap (mNotifications) with qDeleteAll(). But this function does only free the QStrings, but no remove the keys from the hashmap. Thus, a subsequent call to activeNotifications() has an undefined behavior, as there are dangling pointers in the hashmap. This is solved by removing the keys from the hashmap. REVIEW: 127543
168 lines
5.9 KiB
C++
168 lines
5.9 KiB
C++
/**
|
|
* Copyright 2013 Albert Vaca <albertvaka@gmail.com>
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License as
|
|
* published by the Free Software Foundation; either version 2 of
|
|
* the License or (at your option) version 3 or any later version
|
|
* accepted by the membership of KDE e.V. (or its successor approved
|
|
* by the membership of KDE e.V.), which shall act as a proxy
|
|
* defined in Section 14 of version 3 of the license.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "notificationsdbusinterface.h"
|
|
#include "notification_debug.h"
|
|
|
|
#include <QDBusConnection>
|
|
|
|
#include <KNotification>
|
|
#include <QIcon>
|
|
#include <QCryptographicHash>
|
|
|
|
#include <core/device.h>
|
|
#include <core/kdeconnectplugin.h>
|
|
#include <core/filetransferjob.h>
|
|
|
|
#include "notificationsplugin.h"
|
|
|
|
NotificationsDbusInterface::NotificationsDbusInterface(KdeConnectPlugin* plugin)
|
|
: QDBusAbstractAdaptor(const_cast<Device*>(plugin->device()))
|
|
, mDevice(plugin->device())
|
|
, mPlugin(plugin)
|
|
, mLastId(0)
|
|
, imagesDir(QDir::temp().absoluteFilePath("kdeconnect"))
|
|
{
|
|
imagesDir.mkpath(imagesDir.absolutePath());
|
|
}
|
|
|
|
NotificationsDbusInterface::~NotificationsDbusInterface()
|
|
{
|
|
qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Destroying NotificationsDbusInterface";
|
|
}
|
|
|
|
void NotificationsDbusInterface::clearNotifications()
|
|
{
|
|
qDeleteAll(mNotifications);
|
|
mNotifications.clear();
|
|
}
|
|
|
|
QStringList NotificationsDbusInterface::activeNotifications()
|
|
{
|
|
return mNotifications.keys();
|
|
}
|
|
|
|
void NotificationsDbusInterface::processPackage(const NetworkPackage& np)
|
|
{
|
|
if (np.get<bool>("isCancel")) {
|
|
QString id = np.get<QString>("id");
|
|
// cut off kdeconnect-android's prefix if there:
|
|
if (id.startsWith("org.kde.kdeconnect_tp::"))
|
|
id = id.mid(id.indexOf("::") + 2);
|
|
removeNotification(id);
|
|
} else if (np.get<bool>("isRequest")) {
|
|
for (const auto& n: mNotifications) {
|
|
NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
|
|
np.set("id", n->internalId());
|
|
np.set("appName", n->appName());
|
|
np.set("ticker", n->ticker());
|
|
np.set("isClearable", n->dismissable());
|
|
np.set("requestAnswer", true);
|
|
mPlugin->sendPackage(np);
|
|
}
|
|
} else {
|
|
|
|
//TODO: Uncoment when we are able to display app icon on plasmoid
|
|
QString destination;
|
|
/*
|
|
if (np.hasPayload()) {
|
|
QString filename = KMD5(np.get<QString>("appName").toLatin1()).hexDigest(); //TODO: Store with extension?
|
|
destination = imagesDir.absoluteFilePath(filename);
|
|
FileTransferJob* job = np.createPayloadTransferJob(destination);
|
|
job->start();
|
|
}
|
|
*/
|
|
|
|
Notification* noti = new Notification(np, destination, this);
|
|
|
|
//Do not show updates to existent notification nor answers to a initialization request
|
|
if (!mInternalIdToPublicId.contains(noti->internalId()) && !np.get<bool>("requestAnswer", false) && !np.get<bool>("silent", false)) {
|
|
KNotification* notification = new KNotification("notification", KNotification::CloseOnTimeout, this);
|
|
notification->setIconName(QStringLiteral("preferences-desktop-notification"));
|
|
notification->setComponentName("kdeconnect");
|
|
notification->setTitle(mDevice->name());
|
|
notification->setText(noti->appName() + ": " + noti->ticker());
|
|
notification->sendEvent();
|
|
}
|
|
|
|
addNotification(noti);
|
|
}
|
|
}
|
|
|
|
void NotificationsDbusInterface::addNotification(Notification* noti)
|
|
{
|
|
const QString& internalId = noti->internalId();
|
|
|
|
if (mInternalIdToPublicId.contains(internalId)) {
|
|
removeNotification(internalId);
|
|
}
|
|
|
|
connect(noti, &Notification::dismissRequested,
|
|
this, &NotificationsDbusInterface::dismissRequested);
|
|
|
|
const QString& publicId = newId();
|
|
mNotifications[publicId] = noti;
|
|
mInternalIdToPublicId[internalId] = publicId;
|
|
|
|
QDBusConnection::sessionBus().registerObject(mDevice->dbusPath()+"/notifications/"+publicId, noti, QDBusConnection::ExportScriptableContents);
|
|
Q_EMIT notificationPosted(publicId);
|
|
}
|
|
|
|
void NotificationsDbusInterface::removeNotification(const QString& internalId)
|
|
{
|
|
qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "removeNotification" << internalId;
|
|
|
|
if (!mInternalIdToPublicId.contains(internalId)) {
|
|
qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found: " << internalId;
|
|
return;
|
|
}
|
|
|
|
QString publicId = mInternalIdToPublicId.take(internalId);
|
|
|
|
Notification* noti = mNotifications.take(publicId);
|
|
if (!noti) {
|
|
qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found";
|
|
return;
|
|
}
|
|
|
|
//Deleting the notification will unregister it automatically
|
|
//QDBusConnection::sessionBus().unregisterObject(mDevice->dbusPath()+"/notifications/"+publicId);
|
|
noti->deleteLater();
|
|
|
|
Q_EMIT notificationRemoved(publicId);
|
|
}
|
|
|
|
void NotificationsDbusInterface::dismissRequested(const QString& internalId)
|
|
{
|
|
NetworkPackage np(PACKAGE_TYPE_NOTIFICATION);
|
|
np.set<QString>("cancel", internalId);
|
|
mPlugin->sendPackage(np);
|
|
|
|
//Workaround: we erase notifications without waiting a repsonse from the
|
|
//phone because we won't receive a response if we are out of sync and this
|
|
//notification no longer exists. Ideally, each time we reach the phone
|
|
//after some time disconnected we should re-sync all the notifications.
|
|
removeNotification(internalId);
|
|
}
|
|
|
|
QString NotificationsDbusInterface::newId()
|
|
{
|
|
return QString::number(++mLastId);
|
|
}
|