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

Improved reaction notification

Browse source
This commit is contained in:
Sylvain Berfini 2023-09-15 09:55:27 +02:00
parent d531a47c70
commit 14dca2f984
1 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -402,20 +402,36 @@ class NotificationsManager @MainThread constructor(private val context: Context)
private fun showChatMessageReactionNotification(
chatRoom: ChatRoom,
reaction: String,
from: Address,
address: Address,
message: ChatMessage
) {
val notifiable = getNotifiableForRoom(chatRoom)
// Check if a previous reaction notifiable exists from the same person & for the same message
val from = address.asStringUriOnly()
val found = notifiable.messages.find {
it.isReaction && it.reactionToMessageId == message.messageId && it.reactionFrom == from
}
if (found != null) {
Log.i(
"$TAG Found a previous notifiable for a reaction from the same person to the same message"
)
if (notifiable.messages.remove(found)) {
Log.i("$TAG Previous reaction notifiable removed")
} else {
Log.w("$TAG Failed to remove previous reaction notifiable")
}
}
val contact =
coreContext.contactsManager.findContactByAddress(from)
coreContext.contactsManager.findContactByAddress(address)
val contactPicture = contact?.photo
val roundPicture = if (!contactPicture.isNullOrEmpty()) {
ImageUtils.getRoundBitmapFromUri(context, Uri.parse(contactPicture))
} else {
null
}
val displayName = contact?.name ?: LinphoneUtils.getDisplayName(from)
val displayName = contact?.name ?: LinphoneUtils.getDisplayName(address)
val originalMessage = getTextDescribingMessage(message)
val text = AppUtils.getString(R.string.chat_message_reaction_received).format(
@ -433,7 +449,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
isOutgoing = false,
isReaction = true,
reactionToMessageId = message.messageId,
reactionFrom = from.asStringUriOnly()
reactionFrom = address.asStringUriOnly()
)
notifiable.messages.add(notifiableMessage)