From 895ab1d589e7a8a399a38ed78dde03b93ea7f5b4 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 16 Jan 2018 23:25:12 -0500 Subject: [PATCH] Sync contacts for recipients when single conversation is synced --- .../main/java/data/repository/MessageRepository.kt | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index c29d505f..2467fcdb 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -28,9 +28,10 @@ import android.provider.Telephony.Sms import common.util.Keys import common.util.MessageUtils import common.util.extensions.* +import common.util.filter.ContactFilter import data.mapper.CursorToConversation -import data.mapper.CursorToPart import data.mapper.CursorToRecipient +import data.model.Contact import data.model.Conversation import data.model.InboxItem import data.model.Message @@ -50,8 +51,8 @@ class MessageRepository @Inject constructor( private val context: Context, private val messageIds: Keys, private val cursorToConversation: CursorToConversation, - private val cursorToPart: CursorToPart, - private val cursorToRecipient: CursorToRecipient) { + private val cursorToRecipient: CursorToRecipient, + private val contactFilter: ContactFilter) { fun getConversations(archived: Boolean = false): Flowable> { val realm = Realm.getDefaultInstance() @@ -455,15 +456,22 @@ class MessageRepository @Inject constructor( if (cursor.moveToFirst()) { conversation = cursorToConversation.map(cursor) + val realm = Realm.getDefaultInstance() + val contacts = realm.copyFromRealm(realm.where(Contact::class.java).findAll()) + val recipients = conversation.recipients .map { recipient -> recipient.id.toString() } .map { id -> context.contentResolver.query(CursorToRecipient.URI, null, "_id = ?", arrayOf(id), null) } .map { recipientCursor -> recipientCursor.map { cursorToRecipient.map(recipientCursor) } } .flatten() + .map { recipient -> + recipient.apply { contact = contacts.firstOrNull { contactFilter.filter(it, recipient.address) } } + } conversation.recipients.clear() conversation.recipients.addAll(recipients) conversation.insertOrUpdate() + realm.close() } cursor.close()