gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-22 04:59:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #716

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2020-02-03 11:01:57 +01:00
parent a813f9a142
commit 5319c453d2
No known key found for this signature in database
GPG Key ID: CDE0BBD2738C4CC0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.kt
View File

@ -188,8 +188,7 @@ class ChatMessage : IMessage, MessageContentType, MessageContentType.Image {
val lastMessageDisplayText: String val lastMessageDisplayText: String
get() { get() {
if (messageType == MessageType.REGULAR_TEXT_MESSAGE || messageType == if (messageType == MessageType.REGULAR_TEXT_MESSAGE || messageType == MessageType.SYSTEM_MESSAGE || messageType == MessageType.SINGLE_LINK_MESSAGE) {
MessageType.SYSTEM_MESSAGE) {
return text return text
} else { } else {
if (messageType == MessageType.SINGLE_LINK_GIPHY_MESSAGE || messageType == MessageType.SINGLE_LINK_TENOR_MESSAGE || messageType == MessageType.SINGLE_LINK_GIF_MESSAGE) { if (messageType == MessageType.SINGLE_LINK_GIPHY_MESSAGE || messageType == MessageType.SINGLE_LINK_TENOR_MESSAGE || messageType == MessageType.SINGLE_LINK_GIF_MESSAGE) {
@ -212,7 +211,7 @@ class ChatMessage : IMessage, MessageContentType, MessageContentType.Image {
if (!TextUtils.isEmpty(actorDisplayName)) actorDisplayName else sharedApplication if (!TextUtils.isEmpty(actorDisplayName)) actorDisplayName else sharedApplication
!!.getString(R.string.nc_guest)) !!.getString(R.string.nc_guest))
} }
} else if (messageType == MessageType.SINGLE_LINK_MESSAGE) { /*} else if (messageType == MessageType.SINGLE_LINK_MESSAGE) {
return if (actorId.equals(activeUser!!.userId)) { return if (actorId.equals(activeUser!!.userId)) {
sharedApplication!!.resources.getString(R.string.nc_sent_a_link_you) sharedApplication!!.resources.getString(R.string.nc_sent_a_link_you)
} else { } else {
@ -220,7 +219,7 @@ class ChatMessage : IMessage, MessageContentType, MessageContentType.Image {
!!.resources !!.resources
.getString(R.string.nc_sent_a_link), .getString(R.string.nc_sent_a_link),
if (!TextUtils.isEmpty(actorDisplayName)) actorDisplayName else sharedApplication!!.getString(R.string.nc_guest)) if (!TextUtils.isEmpty(actorDisplayName)) actorDisplayName else sharedApplication!!.getString(R.string.nc_guest))
} }*/
} else if (messageType == MessageType.SINGLE_LINK_AUDIO_MESSAGE) { } else if (messageType == MessageType.SINGLE_LINK_AUDIO_MESSAGE) {
return if (actorId.equals(activeUser!!.userId)) { return if (actorId.equals(activeUser!!.userId)) {
sharedApplication!!.resources.getString(R.string.nc_sent_an_audio_you) sharedApplication!!.resources.getString(R.string.nc_sent_an_audio_you)