6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Merge branch 'develop' into feature/dagger

This commit is contained in:
ganfra 2019-06-27 18:57:49 +02:00
parent 2063a3e535 d5625b95fe
commit f91959ea96
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotredesign/features/notifications/NotifiableEventResolver.kt
View File

@ -99,7 +99,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
?: event.root.getClearContent().toModel<MessageContent>()?.body
?: stringProvider.getString(R.string.notification_unknown_new_event)
val roomName = stringProvider.getString(R.string.notification_unknown_room_name)
val senderDisplayName = event.senderName
val senderDisplayName = event.senderName ?: event.root.senderId

val notifiableEvent = NotifiableMessageEvent(
eventId = event.root.eventId!!,
@ -118,7 +118,7 @@ class NotifiableEventResolver @Inject constructor(private val stringProvider: St
?: event.root.getClearContent().toModel<MessageContent>()?.body
?: stringProvider.getString(R.string.notification_unknown_new_event)
val roomName = room.roomSummary?.displayName ?: ""
val senderDisplayName = event.senderName ?: ""
val senderDisplayName = event.senderName ?: event.root.senderId

val notifiableEvent = NotifiableMessageEvent(
eventId = event.root.eventId!!,