mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 19:38:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Should prevent going to the wrong conversation when multiple message notifications are still visible

Browse source
This commit is contained in:
Sylvain Berfini 2024-03-20 16:56:52 +01:00
parent dd96cac3d0
commit 30927ac6db
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/org/linphone/notifications/NotificationsManager.kt
View file

@ -249,7 +249,10 @@ class NotificationsManager @MainThread constructor(private val context: Context)
"$TAG After removing original reaction notification there is still messages, updating notification"
)
val me = coreContext.contactsManager.getMePerson(chatRoom.localAddress)
val pendingIntent = getChatRoomPendingIntent(chatRoom)
val pendingIntent = getChatRoomPendingIntent(
chatRoom,
notifiable.notificationId
)
val notification = createMessageNotification(
notifiable,
pendingIntent,
@ -599,7 +602,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
if (notifiable.messages.isNotEmpty()) {
val me = coreContext.contactsManager.getMePerson(chatRoom.localAddress)
val pendingIntent = getChatRoomPendingIntent(chatRoom)
val pendingIntent = getChatRoomPendingIntent(chatRoom, notifiable.notificationId)
val notification = createMessageNotification(
notifiable,
pendingIntent,
@ -664,7 +667,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
if (notifiable.messages.isNotEmpty()) {
val me = coreContext.contactsManager.getMePerson(chatRoom.localAddress)
val pendingIntent = getChatRoomPendingIntent(chatRoom)
val pendingIntent = getChatRoomPendingIntent(chatRoom, notifiable.notificationId)
val notification = createMessageNotification(
notifiable,
pendingIntent,
@ -1053,7 +1056,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
notifiable.messages.add(reply)
val chatRoom = message.chatRoom
val pendingIntent = getChatRoomPendingIntent(chatRoom)
val pendingIntent = getChatRoomPendingIntent(chatRoom, notifiable.notificationId)
val me = coreContext.contactsManager.getMePerson(chatRoom.localAddress)
val notification = createMessageNotification(
notifiable,
@ -1216,7 +1219,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
}
@WorkerThread
private fun getChatRoomPendingIntent(chatRoom: ChatRoom): PendingIntent {
private fun getChatRoomPendingIntent(chatRoom: ChatRoom, notificationId: Int): PendingIntent {
val args = Bundle()
args.putBoolean("Chat", true)
args.putString("RemoteSipUri", chatRoom.peerAddress.asStringUriOnly())
@ -1230,7 +1233,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
}
)
getPendingIntent(
0,
notificationId,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE,
args // Need to pass args here too for Remote & Local SIP URIs
)!!