From ac7d46cfb70ab20fe3fceaacbc60815b8fb88f0d Mon Sep 17 00:00:00 2001
From: Benoit Marty <benoit@matrix.org>
Date: Tue, 26 Dec 2023 13:46:30 +0100
Subject: [PATCH] Handle `MembershipChange.NONE` rendering in the timeline
 #2102 And avoid `else` in the when statement.

---
 changelog.d/2102.misc                             |  1 +
 .../impl/RoomMembershipContentFormatter.kt        | 15 ++++++++++++++-
 .../impl/src/main/res/values/localazy.xml         |  2 ++
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/2102.misc

diff --git a/changelog.d/2102.misc b/changelog.d/2102.misc
new file mode 100644
index 0000000000..87c258ef70
--- /dev/null
+++ b/changelog.d/2102.misc
@@ -0,0 +1 @@
+Handle `MembershipChange.NONE` rendering in the timeline.
diff --git a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
index 6a65a9bd1e..926648458f 100644
--- a/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
+++ b/libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
@@ -104,7 +104,20 @@ class RoomMembershipContentFormatter @Inject constructor(
             } else {
                 sp.getString(R.string.state_event_room_knock_denied, senderDisplayName, userId.value)
             }
-            else -> {
+            MembershipChange.NONE -> if (senderIsYou) {
+                sp.getString(R.string.state_event_room_none_by_you)
+            } else {
+                sp.getString(R.string.state_event_room_none, senderDisplayName)
+            }
+            MembershipChange.ERROR -> {
+                Timber.v("Filtering timeline item for room membership: $membershipContent")
+                null
+            }
+            MembershipChange.NOT_IMPLEMENTED -> {
+                Timber.v("Filtering timeline item for room membership: $membershipContent")
+                null
+            }
+            null -> {
                 Timber.v("Filtering timeline item for room membership: $membershipContent")
                 null
             }
diff --git a/libraries/eventformatter/impl/src/main/res/values/localazy.xml b/libraries/eventformatter/impl/src/main/res/values/localazy.xml
index 03a13bd29b..525a9435fe 100644
--- a/libraries/eventformatter/impl/src/main/res/values/localazy.xml
+++ b/libraries/eventformatter/impl/src/main/res/values/localazy.xml
@@ -39,6 +39,8 @@
   <string name="state_event_room_name_changed_by_you">"You changed the room name to: %1$s"</string>
   <string name="state_event_room_name_removed">"%1$s removed the room name"</string>
   <string name="state_event_room_name_removed_by_you">"You removed the room name"</string>
+  <string name="state_event_room_none">"%1$s made no changes"</string>
+  <string name="state_event_room_none_by_you">"You made no changes"</string>
   <string name="state_event_room_reject">"%1$s rejected the invitation"</string>
   <string name="state_event_room_reject_by_you">"You rejected the invitation"</string>
   <string name="state_event_room_remove">"%1$s removed %2$s"</string>