Differential D7209 Diff 20837 plugins/notifications/notificationsdbusinterface.cpp

Changeset View

Standalone View

View Options

plugins/notifications/notificationsdbusinterface.cpp

Context not available.
80 } else { 80​ } else {
81 QString id = np.get<QString>(QStringLiteral("id")); 81​ QString id = np.get<QString>(QStringLiteral("id"));
82 82​
83​ Notification* noti;
84​
83 if (!m_internalIdToPublicId.contains(id)) { 85​ if (!m_internalIdToPublicId.contains(id)) {
84 Notification* noti = new Notification(np, this); 86​ noti = new Notification(np, this);
85 addNotification(noti); ​
86 } else { 87​ } else {
87 QString pubId = m_internalIdToPublicId[id]; 88​ QString pubId = m_internalIdToPublicId[id];
88 m_notifications[pubId]->update(np); 89​ noti = m_notifications[pubId];
90​ noti->update(np);
91​ }
92​
93​ if (noti->isReady()) {
94​ addNotification(noti);
95​ } else {
96​ connect(noti, &Notification::ready, this, [this, noti]{
97​ addNotification(noti);
98​ });
89 } 99​ }
90 } 100​ }
91} 101​}
Context not available.
95 const QString& internalId = noti->internalId(); 105​ const QString& internalId = noti->internalId();
96 106​
97 if (m_internalIdToPublicId.contains(internalId)) { 107​ if (m_internalIdToPublicId.contains(internalId)) {
98 removeNotification(internalId); 108​ removeNotification(internalId, KeepNotification);
99 } 109​ }
100 110​
101 //qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "addNotification" << internalId; 111​ //qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "addNotification" << internalId;
Context not available.
115 Q_EMIT notificationPosted(publicId); 125​ Q_EMIT notificationPosted(publicId);
116} 126​}
117 127​
118void NotificationsDbusInterface::removeNotification(const QString& internalId) 128​void NotificationsDbusInterface::removeNotification(const QString& internalId, RemoveType removetype)
119{ 129​{
apolUnsubmitted
Not Done

I'd say it's fine to keep these debug statements. They're showing an error after all and debug is very easy to filter out.

apol: I'd say it's fine to keep these debug statements. They're showing an error after all and debug…
nicolasfellaAuthorUnsubmitted
Not Done

These produce a lot of output which seems to be false alarms

nicolasfella: These produce a lot of output which seems to be false alarms
120 //qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "removeNotification" << internalId; 130​ //qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "removeNotification" << internalId;
121 131​
122 if (!m_internalIdToPublicId.contains(internalId)) { 132​ if (!m_internalIdToPublicId.contains(internalId)) {
123 qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found noti by internal Id: " << internalId; 133​ //qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found noti by internal Id: " << internalId;
124 return; 134​ return;
125 } 135​ }
126 136​
Context not available.
128 138​
129 Notification* noti = m_notifications.take(publicId); 139​ Notification* noti = m_notifications.take(publicId);
130 if (!noti) { 140​ if (!noti) {
131 qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found noti by public Id: " << publicId; 141​ //qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Not found noti by public Id: " << publicId;
132 return; 142​ return;
133 } 143​ }
apolUnsubmitted
Not Done

Can you elaborate on this? I'm not sure where it's from, maybe needs a comment?

apol: Can you elaborate on this? I'm not sure where it's from, maybe needs a comment?
nicolasfellaAuthorUnsubmitted
Not Done

I found this commented out in the code. The goal is to remove the notification from the plasmoid without deleting the noti object because we still want to use it

nicolasfella: I found this commented out in the code. The goal is to remove the notification from the…
134 144​
135 //Deleting the notification will unregister it automatically 145​ //Deleting the notification will unregister it automatically
136 //QDBusConnection::sessionBus().unregisterObject(mDevice->dbusPath()+"/notifications/"+publicId); 146​ if (removetype == KeepNotification){
137 noti->deleteLater(); 147​ QDBusConnection::sessionBus().unregisterObject(m_device->dbusPath()+"/notifications/"+publicId);
148​ } else if (removetype == DestroyNotification){
apolUnsubmitted
Not Done

Unrelated change, remove before committing.

apol: Unrelated change, remove before committing.
149​ noti->deleteLater();
150​ }
138 151​
139 Q_EMIT notificationRemoved(publicId); 152​ Q_EMIT notificationRemoved(publicId);
140} 153​}
Context not available.
apolUnsubmitted
Not Done

Unrelated change, remove before committing.

apol: Unrelated change, remove before committing.