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

Update extension.

Browse source
This commit is contained in:
Benoit Marty 2024-04-17 16:22:50 +02:00 • committed by Benoit Marty
parent 5e28bfef33
commit 57d5ffa97a
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
View file

@ -45,7 +45,7 @@ import io.element.android.libraries.matrix.api.core.UserId
import io.element.android.libraries.matrix.api.permalink.PermalinkData import io.element.android.libraries.matrix.api.permalink.PermalinkData
import io.element.android.libraries.matrix.api.permalink.PermalinkParser import io.element.android.libraries.matrix.api.permalink.PermalinkParser
import io.element.android.libraries.matrix.api.room.MatrixRoom import io.element.android.libraries.matrix.api.room.MatrixRoom
import io.element.android.libraries.matrix.api.room.navigation.isSameRoom import io.element.android.libraries.matrix.api.room.alias.matches
import io.element.android.libraries.matrix.api.room.roomMembers import io.element.android.libraries.matrix.api.room.roomMembers
import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo
import io.element.android.libraries.mediaplayer.api.MediaPlayer import io.element.android.libraries.mediaplayer.api.MediaPlayer
@ -139,7 +139,7 @@ class MessagesNode @AssistedInject constructor(
} }
private fun handleRoomLinkClicked(roomLink: PermalinkData.RoomLink) { private fun handleRoomLinkClicked(roomLink: PermalinkData.RoomLink) {
if (room.isSameRoom(roomLink.roomIdOrAlias)) { if (room.matches(roomLink.roomIdOrAlias)) {
if (roomLink.eventId != null) { if (roomLink.eventId != null) {
// TODO Handle navigation to the Event // TODO Handle navigation to the Event
context.toast("TODO Handle navigation to the Event ${roomLink.eventId}") context.toast("TODO Handle navigation to the Event ${roomLink.eventId}")

4
libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/navigation/Navigation.kt → libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt
View file

@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package io.element.android.libraries.matrix.api.room.navigation package io.element.android.libraries.matrix.api.room.alias
import io.element.android.libraries.matrix.api.core.RoomIdOrAlias import io.element.android.libraries.matrix.api.core.RoomIdOrAlias
import io.element.android.libraries.matrix.api.room.MatrixRoom import io.element.android.libraries.matrix.api.room.MatrixRoom
@ -22,7 +22,7 @@ import io.element.android.libraries.matrix.api.room.MatrixRoom
/** /**
* Return true if the given roomIdOrAlias is the same room as this room. * Return true if the given roomIdOrAlias is the same room as this room.
*/ */
fun MatrixRoom.isSameRoom(roomIdOrAlias: RoomIdOrAlias): Boolean { fun MatrixRoom.matches(roomIdOrAlias: RoomIdOrAlias): Boolean {
return when (roomIdOrAlias) { return when (roomIdOrAlias) {
is RoomIdOrAlias.Id -> { is RoomIdOrAlias.Id -> {
roomIdOrAlias.roomId == roomId roomIdOrAlias.roomId == roomId