Browse Source

Update extension.

pull/2713/head
Benoit Marty 5 months ago committed by Benoit Marty
parent
commit
b7d214fa56
  1. 4
      features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt
  2. 4
      libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/alias/MatrixRoomAlias.kt

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

@ -45,7 +45,7 @@ import io.element.android.libraries.matrix.api.core.UserId @@ -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.PermalinkParser
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.timeline.item.TimelineItemDebugInfo
import io.element.android.libraries.mediaplayer.api.MediaPlayer
@ -139,7 +139,7 @@ class MessagesNode @AssistedInject constructor( @@ -139,7 +139,7 @@ class MessagesNode @AssistedInject constructor(
}
private fun handleRoomLinkClicked(roomLink: PermalinkData.RoomLink) {
if (room.isSameRoom(roomLink.roomIdOrAlias)) {
if (room.matches(roomLink.roomIdOrAlias)) {
if (roomLink.eventId != null) {
// TODO Handle navigation to the Event
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

@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
* 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.room.MatrixRoom
@ -22,7 +22,7 @@ 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.
*/
fun MatrixRoom.isSameRoom(roomIdOrAlias: RoomIdOrAlias): Boolean {
fun MatrixRoom.matches(roomIdOrAlias: RoomIdOrAlias): Boolean {
return when (roomIdOrAlias) {
is RoomIdOrAlias.Id -> {
roomIdOrAlias.roomId == roomId
Loading…
Cancel
Save