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

fix to show placeholder image if vcf contact has no photo

Browse Source 
Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2023-01-17 14:45:20 +01:00
parent 99c6d77b17
commit 90d3d7d217
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt
View File

@ -139,6 +139,7 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
messageText.text = fileName messageText.text = fileName
if (message.selectedIndividualHashMap!!.containsKey(KEY_CONTACT_NAME)) { if (message.selectedIndividualHashMap!!.containsKey(KEY_CONTACT_NAME)) {
previewContainer.visibility = View.GONE previewContainer.visibility = View.GONE
previewContactContainer.visibility = View.VISIBLE
previewContactName.text = message.selectedIndividualHashMap!![KEY_CONTACT_NAME] previewContactName.text = message.selectedIndividualHashMap!![KEY_CONTACT_NAME]
progressBar = previewContactProgressBar progressBar = previewContactProgressBar
messageText.visibility = View.INVISIBLE messageText.visibility = View.INVISIBLE
@ -146,17 +147,23 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
viewThemeUtils!!.talk.colorContactChatItemBackground(previewContactContainer) viewThemeUtils!!.talk.colorContactChatItemBackground(previewContactContainer)
viewThemeUtils!!.talk.colorContactChatItemName(previewContactName) viewThemeUtils!!.talk.colorContactChatItemName(previewContactName)
viewThemeUtils!!.platform.colorCircularProgressBarOnPrimaryContainer(previewContactProgressBar!!) viewThemeUtils!!.platform.colorCircularProgressBarOnPrimaryContainer(previewContactProgressBar!!)
} else {
previewContainer.visibility = View.VISIBLE
previewContactContainer.visibility = View.GONE
}
if (message.selectedIndividualHashMap!!.containsKey(KEY_CONTACT_PHOTO)) { if (message.selectedIndividualHashMap!!.containsKey(KEY_CONTACT_PHOTO)) {
image = previewContactPhoto image = previewContactPhoto
placeholder = getDrawableFromContactDetails( placeholder = getDrawableFromContactDetails(
context, context,
message.selectedIndividualHashMap!![KEY_CONTACT_PHOTO] message.selectedIndividualHashMap!![KEY_CONTACT_PHOTO]
) )
} else if (message.selectedIndividualHashMap!!.containsKey(KEY_MIMETYPE)) { } else {
image = previewContactPhoto
placeholder = ContextCompat.getDrawable(context!!, R.drawable.ic_mimetype_text_vcard)
}
} else {
previewContainer.visibility = View.VISIBLE
previewContactContainer.visibility = View.GONE
}
if (message.selectedIndividualHashMap!!.containsKey(KEY_MIMETYPE)) {
val mimetype = message.selectedIndividualHashMap!![KEY_MIMETYPE] val mimetype = message.selectedIndividualHashMap!![KEY_MIMETYPE]
val drawableResourceId = getDrawableResourceIdForMimeType(mimetype) val drawableResourceId = getDrawableResourceIdForMimeType(mimetype)
val drawable = ContextCompat.getDrawable(context!!, drawableResourceId) val drawable = ContextCompat.getDrawable(context!!, drawableResourceId)
@ -258,10 +265,12 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) :
try { try {
inputStream.close() inputStream.close()
} catch (e: IOException) { } catch (e: IOException) {
val drawableResourceId = getDrawableResourceIdForMimeType("text/vcard") Log.e(TAG, "failed to close stream in getDrawableFromContactDetails", e)
drawable = ContextCompat.getDrawable(context, drawableResourceId)
} }
} }
if (drawable == null) {
drawable = ContextCompat.getDrawable(context!!, R.drawable.ic_mimetype_text_vcard)
}
return drawable return drawable
} }