Do a better job at filtering duplicate numbers

This commit is contained in:
Moez Bhatti
2020-02-05 22:52:29 -05:00
parent bf808a84b6
commit e47bfb54ee
@@ -276,16 +276,16 @@ class SyncRepositoryImpl @Inject constructor(
val uniqueNumbers = mutableListOf<PhoneNumber>() val uniqueNumbers = mutableListOf<PhoneNumber>()
contacts.value contacts.value
.flatMap { it.numbers } .flatMap { it.numbers }
.sortedBy { it.accountType }
.forEach { number -> .forEach { number ->
number.isDefault = defaultNumberIds.any { id -> id == number.id } number.isDefault = defaultNumberIds.any { id -> id == number.id }
val duplicate = uniqueNumbers.any { other -> val duplicate = uniqueNumbers.find { other ->
number.accountType != other.accountType phoneNumberUtils.compare(number.address, other.address)
&& phoneNumberUtils.compare(number.address, other.address)
} }
if (!duplicate) { if (duplicate == null) {
uniqueNumbers += number uniqueNumbers += number
} else if (!duplicate.isDefault && number.isDefault) {
duplicate.isDefault = true
} }
} }