Commit 4780e4eb authored by Leonardo Aramaki's avatar Leonardo Aramaki

Add '@' to display name on reply banner if server uses username otherwise stick to the real name

parent 407a7248
...@@ -182,8 +182,8 @@ class ChatRoomAdapter( ...@@ -182,8 +182,8 @@ class ChatRoomAdapter(
message.apply { message.apply {
when (item.itemId) { when (item.itemId) {
R.id.action_menu_msg_delete -> presenter?.deleteMessage(roomId, id) R.id.action_menu_msg_delete -> presenter?.deleteMessage(roomId, id)
R.id.action_menu_msg_quote -> presenter?.citeMessage(roomType, roomName, id, false) R.id.action_menu_msg_quote -> presenter?.citeMessage(roomType, id, false)
R.id.action_menu_msg_reply -> presenter?.citeMessage(roomType, roomName, id, true) R.id.action_menu_msg_reply -> presenter?.citeMessage(roomType, id, true)
R.id.action_menu_msg_copy -> presenter?.copyMessage(id) R.id.action_menu_msg_copy -> presenter?.copyMessage(id)
R.id.action_menu_msg_edit -> presenter?.editMessage(roomId, id, message.message) R.id.action_menu_msg_edit -> presenter?.editMessage(roomId, id, message.message)
R.id.action_menu_msg_pin_unpin -> { R.id.action_menu_msg_pin_unpin -> {
......
...@@ -326,11 +326,10 @@ class ChatRoomPresenter @Inject constructor( ...@@ -326,11 +326,10 @@ class ChatRoomPresenter @Inject constructor(
* Quote or reply a message. * Quote or reply a message.
* *
* @param roomType The current room type. * @param roomType The current room type.
* @param roomName The name of the current room.
* @param messageId The id of the message to make citation for. * @param messageId The id of the message to make citation for.
* @param mentionAuthor true means the citation is a reply otherwise it's a quote. * @param mentionAuthor true means the citation is a reply otherwise it's a quote.
*/ */
fun citeMessage(roomType: String, roomName: String, messageId: String, mentionAuthor: Boolean) { fun citeMessage(roomType: String, messageId: String, mentionAuthor: Boolean) {
launchUI(strategy) { launchUI(strategy) {
val message = messagesRepository.getById(messageId) val message = messagesRepository.getById(messageId)
val me: Myself? = try { val me: Myself? = try {
...@@ -355,7 +354,7 @@ class ChatRoomPresenter @Inject constructor( ...@@ -355,7 +354,7 @@ class ChatRoomPresenter @Inject constructor(
private fun getDisplayName(user: SimpleUser?): String { private fun getDisplayName(user: SimpleUser?): String {
val username = user?.username ?: "" val username = user?.username ?: ""
return if (settings.useRealName()) user?.name ?: username else username return if (settings.useRealName()) user?.name ?: "@$username" else "@$username"
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment