diff --git a/qksms/src/main/java/common/util/SyncManager.kt b/qksms/src/main/java/common/util/SyncManager.kt index 78a3284b..8c680e2b 100644 --- a/qksms/src/main/java/common/util/SyncManager.kt +++ b/qksms/src/main/java/common/util/SyncManager.kt @@ -22,6 +22,7 @@ import android.content.ContentUris import android.content.Context import android.net.Uri import android.provider.Telephony +import android.telephony.PhoneNumberUtils import common.util.extensions.asFlowable import common.util.extensions.insertOrUpdate import common.util.extensions.map @@ -174,7 +175,11 @@ class SyncManager @Inject constructor( // Update all the recipients with the new contacts val updatedRecipients = recipients.map { recipient -> - recipient.apply { contact = contacts.firstOrNull { contactFilter.filter(it, recipient.address) } } + recipient.apply { + contact = contacts.firstOrNull { + it.numbers.any { PhoneNumberUtils.compare(recipient.address, it.address) } + } + } } realm.insertOrUpdate(updatedRecipients) diff --git a/qksms/src/main/java/data/repository/MessageRepository.kt b/qksms/src/main/java/data/repository/MessageRepository.kt index 2467fcdb..eb01134b 100644 --- a/qksms/src/main/java/data/repository/MessageRepository.kt +++ b/qksms/src/main/java/data/repository/MessageRepository.kt @@ -25,10 +25,10 @@ import android.net.Uri import android.provider.BaseColumns import android.provider.Telephony import android.provider.Telephony.Sms +import android.telephony.PhoneNumberUtils import common.util.Keys import common.util.MessageUtils import common.util.extensions.* -import common.util.filter.ContactFilter import data.mapper.CursorToConversation import data.mapper.CursorToRecipient import data.model.Contact @@ -51,8 +51,7 @@ class MessageRepository @Inject constructor( private val context: Context, private val messageIds: Keys, private val cursorToConversation: CursorToConversation, - private val cursorToRecipient: CursorToRecipient, - private val contactFilter: ContactFilter) { + private val cursorToRecipient: CursorToRecipient) { fun getConversations(archived: Boolean = false): Flowable> { val realm = Realm.getDefaultInstance() @@ -465,7 +464,11 @@ class MessageRepository @Inject constructor( .map { recipientCursor -> recipientCursor.map { cursorToRecipient.map(recipientCursor) } } .flatten() .map { recipient -> - recipient.apply { contact = contacts.firstOrNull { contactFilter.filter(it, recipient.address) } } + recipient.apply { + contact = contacts.firstOrNull { + it.numbers.any { PhoneNumberUtils.compare(recipient.address, it.address) } + } + } } conversation.recipients.clear()