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

Introduce MatrixClient.isMe for checking sessionID

Browse source
This commit is contained in:
Chris Smith 2023-07-07 11:50:32 +01:00
parent 3e087c06da
commit 303a0a6677
6 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultRoomLastMessageFormatter.kt
View file

@ -62,7 +62,7 @@ class DefaultRoomLastMessageFormatter @Inject constructor(
) : RoomLastMessageFormatter {
override fun format(event: EventTimelineItem, isDmRoom: Boolean): CharSequence? {
val isOutgoing = event.sender == matrixClient.sessionId
val isOutgoing = matrixClient.isMe(event.sender)
val senderDisplayName = (event.senderProfile as? ProfileTimelineDetails.Ready)?.displayName ?: event.sender.value
return when (val content = event.content) {
is MessageContent -> processMessageContents(content, senderDisplayName, isDmRoom)

2
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/DefaultTimelineEventFormatter.kt
View file

@ -49,7 +49,7 @@ class DefaultTimelineEventFormatter @Inject constructor(
) : TimelineEventFormatter {
override fun format(event: EventTimelineItem): CharSequence? {
val isOutgoing = event.sender == matrixClient.sessionId
val isOutgoing = matrixClient.isMe(event.sender)
val senderDisplayName = (event.senderProfile as? ProfileTimelineDetails.Ready)?.displayName ?: event.sender.value
return when (val content = event.content) {
is RoomMembershipContent -> {

2
libraries/eventformatter/impl/src/main/kotlin/io/element/android/libraries/eventformatter/impl/RoomMembershipContentFormatter.kt
View file

@ -33,7 +33,7 @@ class RoomMembershipContentFormatter @Inject constructor(
senderIsYou: Boolean,
): CharSequence? {
val userId = membershipContent.userId
val memberIsYou = userId == matrixClient.sessionId
val memberIsYou = matrixClient.isMe(userId)
return when (val change = membershipContent.change) {
MembershipChange.JOINED -> if (memberIsYou) {
sp.getString(R.string.state_event_room_join_by_you)