Browse Source

Handle `MembershipChange.NONE` rendering in the timeline #2102

And avoid `else` in the when statement.
pull/2112/head
Benoit Marty 9 months ago committed by Benoit Marty
parent
commit
ac7d46cfb7
  1. 1
      changelog.d/2102.misc
  2. 15
      libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
  3. 2
      libraries/eventformatter/impl/src/main/res/values/localazy.xml

1
changelog.d/2102.misc

@ -0,0 +1 @@
Handle `MembershipChange.NONE` rendering in the timeline.

15
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt

@ -104,7 +104,20 @@ class RoomMembershipContentFormatter @Inject constructor(
} else { } else {
sp.getString(R.string.state_event_room_knock_denied, senderDisplayName, userId.value) 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") Timber.v("Filtering timeline item for room membership: $membershipContent")
null null
} }

2
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_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">"%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_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">"%1$s rejected the invitation"</string>
<string name="state_event_room_reject_by_you">"You 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> <string name="state_event_room_remove">"%1$s removed %2$s"</string>

Loading…
Cancel
Save