Don't incorrectly match contacts to recipients

This commit is contained in:
Moez Bhatti
2018-01-17 04:11:40 -05:00
parent a288747ea7
commit bea4105f7a
2 changed files with 13 additions and 5 deletions
@@ -22,6 +22,7 @@ import android.content.ContentUris
import android.content.Context import android.content.Context
import android.net.Uri import android.net.Uri
import android.provider.Telephony import android.provider.Telephony
import android.telephony.PhoneNumberUtils
import common.util.extensions.asFlowable import common.util.extensions.asFlowable
import common.util.extensions.insertOrUpdate import common.util.extensions.insertOrUpdate
import common.util.extensions.map import common.util.extensions.map
@@ -174,7 +175,11 @@ class SyncManager @Inject constructor(
// Update all the recipients with the new contacts // Update all the recipients with the new contacts
val updatedRecipients = recipients.map { recipient -> 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) realm.insertOrUpdate(updatedRecipients)
@@ -25,10 +25,10 @@ import android.net.Uri
import android.provider.BaseColumns import android.provider.BaseColumns
import android.provider.Telephony import android.provider.Telephony
import android.provider.Telephony.Sms import android.provider.Telephony.Sms
import android.telephony.PhoneNumberUtils
import common.util.Keys import common.util.Keys
import common.util.MessageUtils import common.util.MessageUtils
import common.util.extensions.* import common.util.extensions.*
import common.util.filter.ContactFilter
import data.mapper.CursorToConversation import data.mapper.CursorToConversation
import data.mapper.CursorToRecipient import data.mapper.CursorToRecipient
import data.model.Contact import data.model.Contact
@@ -51,8 +51,7 @@ class MessageRepository @Inject constructor(
private val context: Context, private val context: Context,
private val messageIds: Keys, private val messageIds: Keys,
private val cursorToConversation: CursorToConversation, private val cursorToConversation: CursorToConversation,
private val cursorToRecipient: CursorToRecipient, private val cursorToRecipient: CursorToRecipient) {
private val contactFilter: ContactFilter) {
fun getConversations(archived: Boolean = false): Flowable<List<InboxItem>> { fun getConversations(archived: Boolean = false): Flowable<List<InboxItem>> {
val realm = Realm.getDefaultInstance() val realm = Realm.getDefaultInstance()
@@ -465,7 +464,11 @@ class MessageRepository @Inject constructor(
.map { recipientCursor -> recipientCursor.map { cursorToRecipient.map(recipientCursor) } } .map { recipientCursor -> recipientCursor.map { cursorToRecipient.map(recipientCursor) } }
.flatten() .flatten()
.map { recipient -> .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() conversation.recipients.clear()