From 9b6c45e112c47de2fb0ee3bcda1e3bcbef157aa8 Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Wed, 19 Aug 2020 15:54:46 +0200
Subject: [PATCH] A Kick appears has "someone has made no change" (Fixes #1959)

---
 CHANGES.md                                                      | 1 +
 .../home/room/detail/timeline/format/NoticeEventFormatter.kt    | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index b43ff50308..b266dc78a5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,7 @@ Bugfix 🐛:
  - Fix crash reported by RageShake
  - Fix refreshing of sessions list when another session is logged out
  - Failed to build unique file (#1954)
+ - A Kick appears has "someone has made no change" (#1959)
 
 Translations 🗣:
  - Add PlayStore description resources in the Triple-T format, to let Weblate handle them
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
index b2709d1e1f..9a4729abee 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/format/NoticeEventFormatter.kt
@@ -327,6 +327,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
         val eventContent: RoomMemberContent? = event.getClearContent().toModel()
         val prevEventContent: RoomMemberContent? = event.resolvedPrevContent().toModel()
         val isMembershipEvent = prevEventContent?.membership != eventContent?.membership
+                || eventContent?.membership == Membership.LEAVE
         return if (isMembershipEvent) {
             buildMembershipNotice(event, senderName, eventContent, prevEventContent)
         } else {
@@ -569,6 +570,7 @@ class NoticeEventFormatter @Inject constructor(private val activeSessionDataSour
                                     sp.getString(R.string.notice_room_withdraw_with_reason, senderDisplayName, targetDisplayName, reason)
                                 } ?: sp.getString(R.string.notice_room_withdraw, senderDisplayName, targetDisplayName)
                             }
+                        Membership.LEAVE,
                         Membership.JOIN   ->
                             if (event.isSentByCurrentUser()) {
                                 eventContent.safeReason?.let { reason ->