Skip to content

Commit b4c4691

Browse files
committed
fix #174, make "Filter out duplicates" a bit more agressive
1 parent 824a8d1 commit b4c4691

File tree

1 file changed

+13
-2
lines changed
  • app/src/main/kotlin/com/simplemobiletools/contacts/models

1 file changed

+13
-2
lines changed

app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,19 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
8585

8686
fun getHashToCompare(): Int {
8787
val newPhoneNumbers = ArrayList<PhoneNumber>()
88-
phoneNumbers.mapTo(newPhoneNumbers, { PhoneNumber(it.value.replace(pattern, ""), 0) })
88+
phoneNumbers.mapTo(newPhoneNumbers) { PhoneNumber(it.value.replace(pattern, ""), 0) }
89+
90+
val newEvents = ArrayList<Event>()
91+
events.mapTo(newEvents) { Event(it.value.replace(pattern, ""), 0) }
92+
93+
val newAddresses = ArrayList<Address>()
94+
addresses.mapTo(newAddresses) { Address(it.value, 0) }
95+
96+
val newEmails = ArrayList<Email>()
97+
emails.mapTo(newEmails) { Email(it.value, 0) }
98+
8999
return copy(id = 0, prefix = "", firstName = getFullName().toLowerCase(), middleName = "", surname = "", suffix = "", photoUri = "",
90-
phoneNumbers = newPhoneNumbers, source = "", starred = 0, contactId = 0, thumbnailUri = "", notes = "").hashCode()
100+
phoneNumbers = newPhoneNumbers, events = newEvents, addresses = newAddresses, emails = newEmails, source = "", starred = 0,
101+
contactId = 0, thumbnailUri = "", notes = "", groups = ArrayList(), websites = ArrayList(), organization = Organization("", "")).hashCode()
91102
}
92103
}

0 commit comments

Comments
 (0)