From 904ce1bbcd63e15398f51a30c8d9e59eb7db2aa9 Mon Sep 17 00:00:00 2001
From: benya <benya@daemonlord.ru>
Date: Sun, 5 Apr 2026 15:05:48 +0300
Subject: [PATCH] fix: suppress stale push notifications for active chats

fix: clear existing chat notifications when FCM arrives for an already open conversation
---
 .../messenger/push/MessengerFirebaseMessagingService.kt          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/android/app/src/main/java/ru/daemonlord/messenger/push/MessengerFirebaseMessagingService.kt b/android/app/src/main/java/ru/daemonlord/messenger/push/MessengerFirebaseMessagingService.kt
index 99d1f23..4ce9746 100644
--- a/android/app/src/main/java/ru/daemonlord/messenger/push/MessengerFirebaseMessagingService.kt
+++ b/android/app/src/main/java/ru/daemonlord/messenger/push/MessengerFirebaseMessagingService.kt
@@ -23,6 +23,7 @@ class MessengerFirebaseMessagingService : FirebaseMessagingService() {
     override fun onMessageReceived(message: RemoteMessage) {
         val payload = PushPayloadParser.parse(message) ?: return
         if (activeChatTracker.activeChatId.value == payload.chatId) {
+            notificationDispatcher.clearChatNotifications(payload.chatId)
             return
         }
         notificationDispatcher.showChatMessage(payload)