diff --git a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt index 86ed761920..84d20fbf94 100644 --- a/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt +++ b/features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesNode.kt @@ -63,6 +63,7 @@ import io.element.android.libraries.matrix.api.room.BaseRoom import io.element.android.libraries.matrix.api.room.alias.matches import io.element.android.libraries.matrix.api.timeline.item.TimelineItemDebugInfo import io.element.android.libraries.mediaplayer.api.MediaPlayer +import io.element.android.libraries.ui.strings.CommonStrings import io.element.android.services.analytics.api.AnalyticsService import kotlinx.collections.immutable.ImmutableList import kotlinx.coroutines.CoroutineScope @@ -185,7 +186,7 @@ class MessagesNode @AssistedInject constructor( eventSink(TimelineEvents.FocusOnEvent(eventId)) } else { // Click on the same room, ignore - context.sameRoomToast() + displaySameRoomToast() } } else { callbacks.forEach { it.onPermalinkClick(roomLink) } @@ -214,7 +215,7 @@ class MessagesNode @AssistedInject constructor( override fun onNavigateToRoom(roomId: RoomId) { if (roomId == room.roomId) { - context.sameRoomToast() + displaySameRoomToast() } else { val permalinkData = PermalinkData.RoomLink(roomId.toRoomIdOrAlias()) callbacks.forEach { it.onPermalinkClick(permalinkData) } @@ -241,8 +242,8 @@ class MessagesNode @AssistedInject constructor( callbacks.forEach { it.onViewKnockRequests() } } - private fun Context.sameRoomToast() { - context.toast("Already viewing this room!") + private fun displaySameRoomToast() { + context.toast(CommonStrings.screen_room_permalink_same_room_android) } @Composable diff --git a/libraries/ui-strings/src/main/res/values/localazy.xml b/libraries/ui-strings/src/main/res/values/localazy.xml index d2cbee9a19..b213319abd 100644 --- a/libraries/ui-strings/src/main/res/values/localazy.xml +++ b/libraries/ui-strings/src/main/res/values/localazy.xml @@ -367,6 +367,7 @@ Are you sure you want to continue?" "Failed processing media to upload, please try again." "Could not retrieve user details" "Message in %1$s" + "Already viewing this room!" "%1$s of %2$s" "%1$s Pinned messages" "Loading message…"