fix guests without name in lastMessage view in conversation list

Signed-off-by: Marcel Hibbe <[email protected]>
nextcloud · Nov 28, 2024 · c9bf41b · c9bf41b
1 parent bf64804
commit c9bf41b
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -20,6 +20,7 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.res.ResourcesCompat
 import com.nextcloud.talk.R
 import com.nextcloud.talk.adapters.items.ConversationItem.ConversationItemViewHolder
+import com.nextcloud.talk.adapters.messages.MessagePayload
 import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
 import com.nextcloud.talk.chat.data.model.ChatMessage.MessageType
 import com.nextcloud.talk.data.database.mappers.asModel
@@ -249,14 +250,15 @@ class ConversationItem(
         } else if (model.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
             lastMessageDisplayText
         } else {
-            val authorDisplayName =
-                if (!TextUtils.isEmpty(chatMessage?.actorDisplayName)) {
-                    chatMessage?.actorDisplayName
-                } else if ("guests" == chatMessage?.actorType) {
-                    appContext.getString(R.string.nc_guest)
-                } else {
-                    ""
-                }
+            val actorName = chatMessage?.actorDisplayName
+            val authorDisplayName = if (!actorName.isNullOrBlank()) {
+                actorName
+            } else if ("guests" == chatMessage?.actorType || "emails" == chatMessage?.actorType) {
+                appContext.getString(R.string.nc_guest)
+            } else {
+                ""
+            }
+
             String.format(
                 appContext.getString(R.string.nc_formatted_message),
                 authorDisplayName,