From c4ac5a238b4f38360d3c000b1ffc6c23d8ec7b4f Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 28 Oct 2018 11:41:19 +0100
Subject: [PATCH] flip company and job position at getting full business
 contact name

---
 .../contacts/models/Contact.kt                | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

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 75d30bff..2ed8b08a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/contacts/models/Contact.kt
@@ -38,16 +38,18 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
         }
 
         if (firstString.isEmpty() && firstName.isEmpty() && middleName.isEmpty() && surname.isEmpty()) {
-            if (organization.company.isNotEmpty()) {
-                firstString = organization.company.normalizeString()
+            val fullCompany = getFullCompany()
+            if (fullCompany.isNotEmpty()) {
+                firstString = fullCompany.normalizeString()
             } else if (emails.isNotEmpty()) {
                 firstString = emails.first().value
             }
         }
 
         if (secondString.isEmpty() && other.firstName.isEmpty() && other.middleName.isEmpty() && other.surname.isEmpty()) {
-            if (other.organization.company.isNotEmpty()) {
-                secondString = other.organization.company.normalizeString()
+            val otherFullCompany = other.getFullCompany()
+            if (otherFullCompany.isNotEmpty()) {
+                secondString = otherFullCompany.normalizeString()
             } else if (other.emails.isNotEmpty()) {
                 secondString = other.emails.first().value
             }
@@ -95,9 +97,7 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
         val fullName = "$prefix $firstPart $lastPart$suffixComma".trim()
         return if (fullName.isEmpty()) {
             if (organization.isNotEmpty()) {
-                var fullOrganization = if (organization.jobPosition.isEmpty()) "" else "${organization.jobPosition}, "
-                fullOrganization += organization.company
-                fullOrganization.trim().trimEnd(',')
+                getFullCompany()
             } else {
                 emails.firstOrNull()?.value?.trim() ?: ""
             }
@@ -118,6 +118,12 @@ data class Contact(val id: Int, var prefix: String, var firstName: String, var m
 
     fun getHashToCompare() = getStringToCompare().hashCode()
 
+    fun getFullCompany(): String {
+        var fullOrganization = if (organization.company.isEmpty()) "" else "${organization.company}, "
+        fullOrganization += organization.jobPosition
+        return fullOrganization.trim().trimEnd(',')
+    }
+
     fun isABusinessContact() = prefix.isEmpty() && firstName.isEmpty() && middleName.isEmpty() && surname.isEmpty() && suffix.isEmpty() && organization.isNotEmpty()
 
     // do a more advanced phone number check here, compare numbers and and search query with dashes, spaces and everything but numbers removed