Merge pull request #4222 from abaker/fix_outgoing_conversation_notifications
Dont set person on sent message notification
This commit is contained in:
commit
7ec0872b78
|
@ -0,0 +1 @@
|
||||||
|
Fix conversation notification for sent messages
|
|
@ -330,11 +330,15 @@ class NotificationDrawerManager @Inject constructor(private val context: Context
|
||||||
}
|
}
|
||||||
roomEventGroupInfo.hasNewEvent = roomEventGroupInfo.hasNewEvent || !event.hasBeenDisplayed
|
roomEventGroupInfo.hasNewEvent = roomEventGroupInfo.hasNewEvent || !event.hasBeenDisplayed
|
||||||
|
|
||||||
val senderPerson = Person.Builder()
|
val senderPerson = if (event.outGoingMessage) {
|
||||||
.setName(event.senderName)
|
null
|
||||||
.setIcon(iconLoader.getUserIcon(event.senderAvatarPath))
|
} else {
|
||||||
.setKey(event.senderId)
|
Person.Builder()
|
||||||
.build()
|
.setName(event.senderName)
|
||||||
|
.setIcon(iconLoader.getUserIcon(event.senderAvatarPath))
|
||||||
|
.setKey(event.senderId)
|
||||||
|
.build()
|
||||||
|
}
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
|
||||||
val openRoomIntent = RoomDetailActivity.shortcutIntent(context, roomId)
|
val openRoomIntent = RoomDetailActivity.shortcutIntent(context, roomId)
|
||||||
|
|
Loading…
Reference in New Issue