From f11f23b8e1c58141434b06526f53be89dcf35ef7 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 16 Sep 2019 19:25:19 +0200 Subject: [PATCH] use only contact name at merging duplicates, not email --- .../simplemobiletools/contacts/pro/helpers/ContactsHelper.kt | 2 +- .../com/simplemobiletools/contacts/pro/models/Contact.kt | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt index b8caf54f..7ceffafa 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt @@ -67,7 +67,7 @@ class ContactsHelper(val context: Context) { } if (ignoredContactSources.isEmpty() && !getAll) { - tempContacts.filter { displayContactSources.contains(it.source) }.groupBy { "${it.getNameToDisplay().toLowerCase()}${it.emails}" }.values.forEach { it -> + tempContacts.filter { displayContactSources.contains(it.source) }.groupBy { it.getNameToDisplay().toLowerCase()}.values.forEach { it -> if (it.size == 1) { resultContacts.add(it.first()) } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt index df352182..8533f942 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/models/Contact.kt @@ -108,11 +108,8 @@ data class Contact(var id: Int, var prefix: String, var firstName: String, var m } fun getStringToCompare(): String { - val newEmails = ArrayList() - emails.mapTo(newEmails) { Email(it.value, 0, "") } - return copy(id = 0, prefix = "", firstName = getNameToDisplay().toLowerCase(), middleName = "", surname = "", suffix = "", nickname = "", photoUri = "", - phoneNumbers = ArrayList(), events = ArrayList(), source = "", addresses = ArrayList(), emails = newEmails, starred = 0, contactId = 0, + phoneNumbers = ArrayList(), emails = ArrayList(), events = ArrayList(), source = "", addresses = ArrayList(), starred = 0, contactId = 0, thumbnailUri = "", notes = "", groups = ArrayList(), websites = ArrayList(), organization = Organization("", ""), IMs = ArrayList()).toString() }