ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-05 04:15:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Replace 'leave room' text with 'leave conversation' for DMs (#2231)

Browse Source 
* Replace 'leave room' text with 'leave conversation' for DMs

* Add `isDm` property to both `RoomSummary` and `RoomListRoomSummary`

* Remove redundant `leave_conversation_alert_subtitle_*` texts

* Fix maestro flow

---------

Co-authored-by: ElementBot <benoitm+elementbot@element.io>
This commit is contained in:
Jorge Martin Espinosa
2024-01-16 15:49:44 +01:00
committed by GitHub
parent d7dcd7aa34
commit 27f55c0bc4
77 changed files with 115 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/messagecomposer/MessageComposerPresenter.kt
+1 -2
View File
@@ -183,9 +183,8 @@ class MessageComposerPresenter @Inject constructor(
val currentUserId = currentSessionIdHolder.current
suspend fun canSendRoomMention(): Boolean {
val roomIsDm = room.isDirect && room.isOneToOne
val userCanSendAtRoom = room.canUserTriggerRoomNotification(currentUserId).getOrDefault(false)
return !roomIsDm && userCanSendAtRoom
return !room.isDm && userCanSendAtRoom
}
// This will trigger a search immediately when `@` is typed