forked from upstream-mirrors/quik
Conversation as field in Message
This commit is contained in:
@@ -138,8 +138,8 @@ class NotificationManagerImpl @Inject constructor(
|
||||
return
|
||||
}
|
||||
|
||||
val threadId = message.threadId
|
||||
val conversation = messageRepo.getConversation(threadId) ?: return
|
||||
val conversation = message.conversation ?: return
|
||||
val threadId = conversation.id
|
||||
|
||||
val contentIntent = Intent(context, ComposeActivity::class.java).putExtra("threadId", threadId)
|
||||
val taskStackBuilder = TaskStackBuilder.create(context)
|
||||
|
||||
@@ -18,13 +18,13 @@
|
||||
*/
|
||||
package common.util.filter
|
||||
|
||||
import model.Conversation
|
||||
import model.Message
|
||||
import javax.inject.Inject
|
||||
|
||||
class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter<Conversation>() {
|
||||
class ConversationFilter @Inject constructor(private val recipientFilter: RecipientFilter) : Filter<Message>() {
|
||||
|
||||
override fun filter(item: Conversation, query: CharSequence): Boolean {
|
||||
return item.recipients.any { recipient -> recipientFilter.filter(recipient, query) }
|
||||
override fun filter(item: Message, query: CharSequence): Boolean {
|
||||
return item.conversation?.recipients?.any { recipient -> recipientFilter.filter(recipient, query) } ?: false
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user