Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Handle MembershipChange.NONE rendering in the timeline #2102

Browse source 
And avoid `else` in the when statement.
This commit is contained in:
Benoit Marty 2023-12-26 13:46:30 +01:00 • committed by Benoit Marty
parent 6ae379d638
commit bf356171a3
3 changed files with 17 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/2102.misc Normal file
View file

@ -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
View file

@ -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
View file

@ -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>