Merge branch 'SimpleMobileTools:master' into feature_attachments
This commit is contained in:
commit
d202c3b172
39 changed files with 264 additions and 137 deletions
|
|
@ -301,6 +301,7 @@ class ConversationsAdapter(
|
|||
draft_indicator.setTextColor(properPrimaryColor)
|
||||
|
||||
pin_indicator.beVisibleIf(activity.config.pinnedConversations.contains(conversation.threadId.toString()))
|
||||
pin_indicator.applyColorFilter(textColor)
|
||||
|
||||
conversation_frame.isSelected = selectedKeys.contains(conversation.hashCode())
|
||||
|
||||
|
|
|
|||
|
|
@ -376,7 +376,11 @@ class ThreadAdapter(
|
|||
builder.override(attachment.width, attachment.height)
|
||||
}
|
||||
|
||||
builder.into(imageView.attachment_image)
|
||||
try {
|
||||
builder.into(imageView.attachment_image)
|
||||
} catch (ignore: Exception) {
|
||||
}
|
||||
|
||||
imageView.attachment_image.setOnClickListener {
|
||||
if (actModeCallback.isSelectable) {
|
||||
holder.viewClicked(message)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue