fenix
/
Simple-Contacts
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

properly compare contacts that have no name or organization, just email

This commit is contained in:
tibbi 2018-10-27 17:20:35 +02:00
parent b3bd0f182b
commit ca453ff04d
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,12 +37,20 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
} }
} }
if (firstString.isEmpty() && firstName.isEmpty() && middleName.isEmpty() && surname.isEmpty() && organization.company.isNotEmpty()) { if (firstString.isEmpty() && firstName.isEmpty() && middleName.isEmpty() && surname.isEmpty()) {
firstString = organization.company.normalizeString() if (organization.company.isNotEmpty()) {
firstString = organization.company.normalizeString()
} else if (emails.isNotEmpty()) {
firstString = emails.first().value
}
} }
if (secondString.isEmpty() && other.firstName.isEmpty() && other.middleName.isEmpty() && other.surname.isEmpty() && other.organization.company.isNotEmpty()) { if (secondString.isEmpty() && other.firstName.isEmpty() && other.middleName.isEmpty() && other.surname.isEmpty()) {
secondString = other.organization.company.normalizeString() if (other.organization.company.isNotEmpty()) {
secondString = other.organization.company.normalizeString()
} else if (other.emails.isNotEmpty()) {
secondString = other.emails.first().value
}
} }
var result = if (firstString.firstOrNull()?.isLetter() == true && secondString.firstOrNull()?.isLetter() == false) { var result = if (firstString.firstOrNull()?.isLetter() == true && secondString.firstOrNull()?.isLetter() == false) {