Skip to content

Commit aca6f9e

Browse files
committed
eventformatter : format m.room.pinned_events
1 parent 8a3489c commit aca6f9e

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,13 @@ class StateContentFormatter @Inject constructor(
8080
else -> sp.getString(R.string.state_event_room_topic_removed, senderDisambiguatedDisplayName)
8181
}
8282
}
83+
OtherState.RoomPinnedEvents -> {
84+
when {
85+
//TODO manage all cases when available
86+
senderIsYou -> sp.getString(R.string.state_event_room_pinned_events_changed_by_you)
87+
else -> sp.getString(R.string.state_event_room_pinned_events_changed, senderDisambiguatedDisplayName)
88+
}
89+
}
8390
is OtherState.Custom -> when (renderingMode) {
8491
RenderingMode.RoomList -> {
8592
Timber.v("Filtering timeline item for room state change: $content")
@@ -161,15 +168,6 @@ class StateContentFormatter @Inject constructor(
161168
"RoomJoinRules"
162169
}
163170
}
164-
OtherState.RoomPinnedEvents -> when (renderingMode) {
165-
RenderingMode.RoomList -> {
166-
Timber.v("Filtering timeline item for room state change: $content")
167-
null
168-
}
169-
RenderingMode.Timeline -> {
170-
"RoomPinnedEvents"
171-
}
172-
}
173171
is OtherState.RoomUserPowerLevels -> when (renderingMode) {
174172
RenderingMode.RoomList -> {
175173
Timber.v("Filtering timeline item for room state change: $content")

libraries/eventformatter/impl/src/main/res/values/localazy.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,12 @@
4545
<string name="state_event_room_name_removed_by_you">"You removed the room name"</string>
4646
<string name="state_event_room_none">"%1$s made no changes"</string>
4747
<string name="state_event_room_none_by_you">"You made no changes"</string>
48+
<string name="state_event_room_pinned_events_changed">"%1$s changed the pinned messages"</string>
49+
<string name="state_event_room_pinned_events_changed_by_you">"You changed the pinned messages"</string>
50+
<string name="state_event_room_pinned_events_pinned">"%1$s pinned a message"</string>
51+
<string name="state_event_room_pinned_events_pinned_by_you">"You pinned a message"</string>
52+
<string name="state_event_room_pinned_events_unpinned">"%1$s unpinned a message"</string>
53+
<string name="state_event_room_pinned_events_unpinned_by_you">"You unpinned a message"</string>
4854
<string name="state_event_room_reject">"%1$s rejected the invitation"</string>
4955
<string name="state_event_room_reject_by_you">"You rejected the invitation"</string>
5056
<string name="state_event_room_remove">"%1$s removed %2$s"</string>

0 commit comments

Comments
 (0)