From 4f97fce695b799563aa64116fe89dfac1a7d97b2 Mon Sep 17 00:00:00 2001 From: tibbi Date: Tue, 10 Apr 2018 22:55:13 +0200 Subject: [PATCH] fix #123, show the business as contact name if only that is filled --- .../com/simplemobiletools/contacts/models/Contact.kt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) 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 47f8800c..6ea68447 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt @@ -72,6 +72,13 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m val lastPart = if (startWithSurname) firstName else surname val suffixComma = if (suffix.isEmpty()) "" else ", $suffix" - return "$prefix $firstPart $lastPart$suffixComma".trim() + val fullName = "$prefix $firstPart $lastPart$suffixComma".trim() + return if (fullName.isEmpty()) { + var fullOrganization = if (organization.jobPosition.isEmpty()) "" else "${organization.jobPosition}, " + fullOrganization += organization.company + fullOrganization.trim().trimEnd(',') + } else { + fullName + } } }