benya/Messenger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: restore push delivery across clients
Some checks failed
Android CI / android (push) Has started running
Details
Android Release / release (push) Has been cancelled
Details
CI / test (push) Has started running
Details

Browse Source 
fix: stop suppressing server push notifications based on coarse online presence

fix: rely on FCM delivery for message notifications and remove duplicate Android realtime alerts
This commit is contained in:
Alex
2026-04-05 15:25:01 +03:00
parent efd21e6c0f
commit fc98720c4f
2 changed files with 17 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
android/app/src/main/java/ru/daemonlord/messenger/domain/realtime/usecase/HandleRealtimeEventsUseCase.kt
View File

@@ -8,15 +8,12 @@ import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import ru.daemonlord.messenger.data.chat.local.dao.ChatDao
import ru.daemonlord.messenger.core.notifications.ActiveChatTracker
import ru.daemonlord.messenger.core.notifications.ChatNotificationPayload
import ru.daemonlord.messenger.core.notifications.NotificationDispatcher
import ru.daemonlord.messenger.core.token.TokenRepository
import ru.daemonlord.messenger.data.message.local.dao.MessageDao
import ru.daemonlord.messenger.data.message.local.entity.MessageEntity
import ru.daemonlord.messenger.domain.chat.repository.ChatRepository
import ru.daemonlord.messenger.domain.message.repository.MessageRepository
import ru.daemonlord.messenger.domain.notifications.repository.NotificationSettingsRepository
import ru.daemonlord.messenger.domain.notifications.usecase.ShouldShowMessageNotificationUseCase
import ru.daemonlord.messenger.domain.realtime.RealtimeManager
import ru.daemonlord.messenger.domain.realtime.model.RealtimeEvent
import javax.inject.Inject
@@ -32,8 +29,6 @@ class HandleRealtimeEventsUseCase @Inject constructor(
private val notificationDispatcher: NotificationDispatcher,
private val activeChatTracker: ActiveChatTracker,
private val tokenRepository: TokenRepository,
private val notificationSettingsRepository: NotificationSettingsRepository,
private val shouldShowMessageNotificationUseCase: ShouldShowMessageNotificationUseCase,
) {
private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
@@ -113,37 +108,6 @@ class HandleRealtimeEventsUseCase @Inject constructor(
)
}
chatRepository.refreshChat(chatId = event.chatId)
val muted = chatDao.isChatMuted(event.chatId) == true
val shouldNotify = shouldShowMessageNotificationUseCase(
chatId = event.chatId,
isMention = isMention,
serverMuted = muted,
)
if (!isOwnMessage && activeChatId != event.chatId && shouldNotify) {
val title = chatDao.getChatDisplayTitle(event.chatId) ?: "New message"
val previewEnabled = notificationSettingsRepository.getSettings().previewEnabled
val body = (if (previewEnabled) {
event.text?.takeIf { it.isNotBlank() }
} else {
null
}) ?: when (event.type?.lowercase()) {
"image" -> "Photo"
"video" -> "Video"
"audio" -> "Audio"
"voice" -> "Voice message"
"file" -> "File"
else -> "Open chat"
}
notificationDispatcher.showChatMessage(
ChatNotificationPayload(
chatId = event.chatId,
messageId = event.messageId,
title = title,
body = body,
isMention = isMention,
)
)
}
}
is RealtimeEvent.MessageUpdated -> {