From 03d51281a2fc43ba7852ded0b5d732b2b5cfdaba Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 4 Dec 2019 19:18:35 +0100 Subject: [PATCH] Mistake --- .../home/room/detail/timeline/format/NoticeEventFormatter.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt index 8cdb93a99d..75100e6c03 100644 --- a/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt +++ b/vector/src/main/java/im/vector/riotx/features/home/room/detail/timeline/format/NoticeEventFormatter.kt @@ -192,15 +192,14 @@ class NoticeEventFormatter @Inject constructor(private val sessionHolder: Active } ?: sp.getString(R.string.notice_room_invite_no_invitee, senderDisplayName) else -> eventContent.safeReason?.let { reason -> - sp.getString(R.string.notice_room_invite, senderDisplayName, targetDisplayName, reason) + sp.getString(R.string.notice_room_invite_with_reason, senderDisplayName, targetDisplayName, reason) } ?: sp.getString(R.string.notice_room_invite, senderDisplayName, targetDisplayName) } } Membership.JOIN -> eventContent.safeReason?.let { reason -> sp.getString(R.string.notice_room_join_with_reason, senderDisplayName, reason) - } - ?: sp.getString(R.string.notice_room_join, senderDisplayName) + } ?: sp.getString(R.string.notice_room_join, senderDisplayName) Membership.LEAVE -> // 2 cases here: this member may have left voluntarily or they may have been "left" by someone else ie. kicked if (event.senderId == event.stateKey) {