diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt index 3c3db172..17563ce7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt @@ -244,7 +244,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: ArrayList - tempContacts.groupBy { "${it.getFullName().toLowerCase()}${it.emails}" }.values.forEach { + tempContacts.groupBy { "${it.getNameToDisplay().toLowerCase()}${it.emails}" }.values.forEach { if (it.size == 1) { resultContacts.add(it.first()) } else { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt index 9cc27af8..aa824798 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/VcfImporter.kt @@ -139,7 +139,7 @@ class VcfImporter(val activity: SimpleActivity) { targetContactSource, starred, contactId, thumbnailUri, photo, notes, groups, organization, websites, cleanPhoneNumbers, IMs) // if there is no N and ORG fields at the given contact, only FN, treat it as an organization - if (contact.getFullName().isEmpty() && contact.organization.isEmpty() && ezContact.formattedName.value.isNotEmpty()) { + if (contact.getNameToDisplay().isEmpty() && contact.organization.isEmpty() && ezContact.formattedName.value.isNotEmpty()) { contact.organization.company = ezContact.formattedName.value } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt index 29f73546..da881b7a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt @@ -64,7 +64,7 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m -1 } else { if (firstString.toLowerCase() == secondString.toLowerCase()) { - getFullName().compareTo(other.getFullName(), true) + getNameToDisplay().compareTo(other.getNameToDisplay(), true) } else { firstString.compareTo(secondString, true) } @@ -84,7 +84,7 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m else -> surname } - fun getFullName(): String { + fun getNameToDisplay(): String { var firstPart = if (startWithSurname) surname else firstName if (middleName.isNotEmpty()) { firstPart += " $middleName" @@ -110,7 +110,7 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m val newEmails = ArrayList() emails.mapTo(newEmails) { Email(it.value, 0, "") } - return copy(id = 0, prefix = "", firstName = getFullName().toLowerCase(), middleName = "", surname = "", suffix = "", nickname = "", photoUri = "", + return copy(id = 0, prefix = "", firstName = getNameToDisplay().toLowerCase(), middleName = "", surname = "", suffix = "", nickname = "", photoUri = "", phoneNumbers = ArrayList(), events = ArrayList(), addresses = ArrayList(), emails = newEmails, source = "", starred = 0, contactId = 0, thumbnailUri = "", notes = "", groups = ArrayList(), websites = ArrayList(), organization = Organization("", ""), IMs = ArrayList()).toString()