Implement notification dismissal handling

Author: SunPodder

src/MainWindow.cpp

@@ -62,6 +62,8 @@ void MainWindow::setupUI()
     // Connect signals
     connect(m_notificationManager, &NotificationManager::notificationReceived,
             m_notificationPanel, &NotificationPanel::addNotification);
+    connect(m_notificationManager, &NotificationManager::notificationRemoved,
+            m_notificationPanel, &NotificationPanel::removeNotification);
 
     // Connect popup manager to show popups for new notifications
     connect(m_notificationManager, &NotificationManager::notificationReceived,

src/NotificationClient.cpp

@@ -302,6 +302,7 @@ void NotificationClient::sendConnectionRequest()
 
     connMsg["payload"] = payload;
 
+    Logger::debug("Sending connection request to server: " + QJsonDocument(connMsg).toJson(QJsonDocument::Compact));
     sendMessage(connMsg);
 }
 
@@ -358,22 +359,42 @@ void NotificationClient::handleMessage(const QJsonObject& message)
             }
         }
     }
+    else if (msgType == "notification_action") {
+        if (m_handshakeComplete) {
+            handleNotificationAction(message);
+        }
+    }
     else if (msgType == "ping") {
         Logger::debug(QString("Received ping with ID: %1").arg(message.value("id").toString()));
         handlePing(message);
     }
     else {
-        Logger::warning(QString("Unknown message type: %1").arg(msgType));
+        Logger::warning(QString("Unknown message type: %1, message: %2")
+                .arg(msgType, QJsonDocument(message).toJson(QJsonDocument::Compact)));
     }
 }
 
 void NotificationClient::handlePing(const QJsonObject& message)
 {
     QString pingId = message.value("id").toString();
-    Logger::debug(QString("Sending pong response for ping ID: %1").arg(pingId));
     sendPong(pingId);
 }
 
+void NotificationClient::handleNotificationAction(const QJsonObject& message)
+{
+    QJsonObject payload = message.value("payload").toObject();
+    QString notificationId = payload.value("id").toString();
+    QString actionType = payload.value("type").toString();
+    
+    if (actionType == "notification_dismiss") {
+        Logger::debug(QString("Received dismiss action for notification: %1").arg(notificationId));
+        emit notificationDismissed(notificationId);
+    } else {
+        // Handle other action types if needed in the future
+        Logger::debug(QString("Received notification action type '%1' for notification: %2").arg(actionType, notificationId));
+    }
+}
+
 void NotificationClient::sendPong(const QString& pingId)
 {
     QJsonObject pongMsg;
@@ -385,6 +406,7 @@ void NotificationClient::sendPong(const QString& pingId)
     payload["device"] = "Relay-PC";
     pongMsg["payload"] = payload;
 
+    Logger::debug("Sending pong to server: " + QJsonDocument(pongMsg).toJson(QJsonDocument::Compact));
     sendMessage(pongMsg);
 }
 
@@ -404,6 +426,7 @@ void NotificationClient::sendNotificationReply(const QString& notificationId, co
     payload["body"] = replyText;
     actionMsg["payload"] = payload;
 
+    Logger::debug("Sending notification reply to server: " + QJsonDocument(actionMsg).toJson(QJsonDocument::Compact));
     sendMessage(actionMsg);
 }
 
@@ -422,23 +445,26 @@ void NotificationClient::sendNotificationAction(const QString& notificationId, c
     payload["type"] = "action";
     actionMsg["payload"] = payload;
 
+    Logger::debug("Sending notification action to server: " + QJsonDocument(actionMsg).toJson(QJsonDocument::Compact));
     sendMessage(actionMsg);
 }
 
 void NotificationClient::sendNotificationDismiss(const QString& notificationId)
 {
     if (!m_handshakeComplete) return;
 
-    QJsonObject dismissMsg;
-    dismissMsg["type"] = "notification_dismiss";
-    dismissMsg["id"] = QUuid::createUuid().toString(QUuid::WithoutBraces);
-    dismissMsg["timestamp"] = QDateTime::currentSecsSinceEpoch();
+    QJsonObject actionMsg;
+    actionMsg["type"] = "notification_action";
+    actionMsg["id"] = QUuid::createUuid().toString(QUuid::WithoutBraces);
+    actionMsg["timestamp"] = QDateTime::currentSecsSinceEpoch();
 
     QJsonObject payload;
     payload["id"] = notificationId;
-    dismissMsg["payload"] = payload;
+    payload["type"] = "notification_dismiss";
+    actionMsg["payload"] = payload;
 
-    sendMessage(dismissMsg);
+    Logger::debug("Sending notification dismiss to server: " + QJsonDocument(actionMsg).toJson(QJsonDocument::Compact));
+    sendMessage(actionMsg);
 }
 
 void NotificationClient::onReconnectTimer()

src/NotificationClient.h

@@ -38,6 +38,7 @@ class NotificationClient : public QObject
     void connected();
     void disconnected();
     void notificationReceived(const NotificationData& notification);
+    void notificationDismissed(const QString& notificationId); // New signal for incoming dismisses
     void errorOccurred(const QString& error);
     void serverDiscovered(const QHostAddress& address, quint16 port);
 
@@ -57,6 +58,7 @@ private slots:
     void sendMessage(const QJsonObject& message);
     void handleMessage(const QJsonObject& message);
     void handlePing(const QJsonObject& message);
+    void handleNotificationAction(const QJsonObject& message);
     void sendPong(const QString& pingId);
     NotificationData parseNotificationJson(const QJsonObject& json);
     void startReconnectTimer();

src/NotificationManager.cpp

@@ -1,5 +1,6 @@
 #include "NotificationManager.h"
 #include "NotificationClient.h"
+#include "src/Logger.h"
 
 #include <QTimer>
 #include <QDateTime>
@@ -20,6 +21,8 @@ NotificationManager::NotificationManager(QObject *parent)
     m_client = new NotificationClient(this);
     connect(m_client, &NotificationClient::notificationReceived,
             this, &NotificationManager::onClientNotificationReceived);
+    connect(m_client, &NotificationClient::notificationDismissed,
+            this, &NotificationManager::onClientNotificationDismissed);
     connect(m_client, &NotificationClient::connected,
             this, &NotificationManager::onClientConnected);
     connect(m_client, &NotificationClient::disconnected,
@@ -52,8 +55,15 @@ void NotificationManager::removeNotification(int notificationId)
 {
     for (int i = 0; i < m_notifications.size(); ++i) {
         if (m_notifications[i].id == notificationId) {
+            QString stringId = m_notifications[i].stringId;
             m_notifications.removeAt(i);
             emit notificationRemoved(notificationId);
+            
+            // Send dismiss message to Android if we have a string ID and client
+            if (!stringId.isEmpty() && m_client && m_client->isConnected()) {
+                m_client->sendNotificationDismiss(stringId);
+            }
+            
             break;
         }
     }
@@ -165,6 +175,19 @@ void NotificationManager::onClientNotificationReceived(const NotificationData& n
     addNotification(notification);
 }
 
+void NotificationManager::onClientNotificationDismissed(const QString& notificationId)
+{
+    // Find and remove the notification with the matching string ID
+    for (int i = 0; i < m_notifications.size(); ++i) {
+        if (m_notifications[i].stringId == notificationId) {
+            int intId = m_notifications[i].id;
+            m_notifications.removeAt(i);
+            emit notificationRemoved(intId);
+            break;
+        }
+    }
+}
+
 void NotificationManager::onClientConnected()
 {
     emit serverConnected();

src/NotificationManager.h

@@ -41,6 +41,7 @@ class NotificationManager : public QObject
 private slots:
     void generateTestNotification();
     void onClientNotificationReceived(const NotificationData& notification);
+    void onClientNotificationDismissed(const QString& notificationId);
     void onClientConnected();
     void onClientDisconnected();
     void onClientError(const QString& error);

src/NotificationPanel.cpp

@@ -274,16 +274,24 @@ void NotificationPanel::addNotification(const NotificationData& notification)
 
 void NotificationPanel::removeNotification(int notificationId)
 {
+    // Find the notification card and get its string ID for dismiss
+    QString stringId;
     for (int i = 0; i < m_notificationCards.size(); ++i) {
         NotificationCard* card = m_notificationCards[i];
         if (card->getNotificationId() == notificationId) {
+            stringId = card->getNotificationData().stringId;
             m_scrollLayout->removeWidget(card);
             m_notificationCards.removeAt(i);
             card->deleteLater();
             break;
         }
     }
 
+    // Notify the notification manager to handle the dismiss (which will send to Android)
+    if (m_notificationManager && !stringId.isEmpty()) {
+        m_notificationManager->removeNotification(notificationId);
+    }
+    
     updateEmptyState();
 }