gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-08 21:40:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix guests without name for Mention autocomplete

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2024-11-27 17:43:17 +01:00
parent 1b6d620915
commit 6932ddff4b
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt
View File

@ -16,6 +16,7 @@ import androidx.core.content.res.ResourcesCompat
import com.nextcloud.talk.R import com.nextcloud.talk.R
import com.nextcloud.talk.adapters.items.ParticipantItem.ParticipantItemViewHolder import com.nextcloud.talk.adapters.items.ParticipantItem.ParticipantItemViewHolder
import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.data.user.model.User
import com.nextcloud.talk.extensions.loadDefaultAvatar
import com.nextcloud.talk.extensions.loadFederatedUserAvatar import com.nextcloud.talk.extensions.loadFederatedUserAvatar
import com.nextcloud.talk.extensions.loadGuestAvatar import com.nextcloud.talk.extensions.loadGuestAvatar
import com.nextcloud.talk.extensions.loadUserAvatar import com.nextcloud.talk.extensions.loadUserAvatar
@ -56,7 +57,15 @@ class MentionAutocompleteItem(
init { init {
mentionId = mention.mentionId mentionId = mention.mentionId
objectId = mention.id objectId = mention.id
displayName = mention.label
displayName = if (!mention.label.isNullOrBlank()) {
mention.label
} else if ("guests" == mention.source || "emails" == mention.source) {
context.resources.getString(R.string.nc_guest)
} else {
""
}
source = mention.source source = mention.source
status = mention.status status = mention.status
statusIcon = mention.statusIcon statusIcon = mention.statusIcon
@ -149,7 +158,11 @@ class MentionAutocompleteItem(
SOURCE_GUESTS, SOURCE_EMAILS -> { SOURCE_GUESTS, SOURCE_EMAILS -> {
avatarId = displayName avatarId = displayName
holder.binding.avatarView.loadGuestAvatar(currentUser, avatarId!!, false) if (displayName.equals(context.resources.getString(R.string.nc_guest))) {
holder.binding.avatarView.loadDefaultAvatar(viewThemeUtils)
} else {
holder.binding.avatarView.loadGuestAvatar(currentUser, avatarId!!, false)
}
} }
else -> { else -> {