From c6b22ccc9436ff842a0b2e3bb86d495572fdb80c Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Fri, 3 Apr 2020 16:03:21 +0200
Subject: [PATCH] properly recognize Organization contacts too

---
 .../smsmessenger/activities/MainActivity.kt   | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
index 5f90d670..ec365aff 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/MainActivity.kt
@@ -113,7 +113,10 @@ class MainActivity : SimpleActivity() {
         val projection = arrayOf(
             ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME,
             ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME,
-            ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME
+            ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME,
+            ContactsContract.CommonDataKinds.Organization.COMPANY,
+            ContactsContract.CommonDataKinds.Organization.TITLE,
+            ContactsContract.Data.MIMETYPE
         )
 
         val selection =
@@ -128,11 +131,24 @@ class MainActivity : SimpleActivity() {
         try {
             cursor = contentResolver.query(uri, projection, selection, selectionArgs, null)
             if (cursor?.moveToFirst() == true) {
-                val firstName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME) ?: ""
-                val middleName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME) ?: ""
-                val familyName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME) ?: ""
-                val names = arrayOf(firstName, middleName, familyName).filter { it.isNotEmpty() }
-                return TextUtils.join(" ", names)
+                do {
+                    val mimetype = cursor.getStringValue(ContactsContract.Data.MIMETYPE)
+                    val firstName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.GIVEN_NAME) ?: ""
+                    val middleName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.MIDDLE_NAME) ?: ""
+                    val familyName = cursor.getStringValue(ContactsContract.CommonDataKinds.StructuredName.FAMILY_NAME) ?: ""
+                    val isPerson = mimetype == ContactsContract.CommonDataKinds.StructuredName.CONTENT_ITEM_TYPE
+                    if (isPerson && (firstName.isNotEmpty() || middleName.isNotEmpty() || familyName.isNotEmpty())) {
+                        val names = arrayOf(firstName, middleName, familyName).filter { it.isNotEmpty() }
+                        return TextUtils.join(" ", names)
+                    }
+
+                    val isOrganization = mimetype == ContactsContract.CommonDataKinds.Organization.CONTENT_ITEM_TYPE
+                    val company = cursor.getStringValue(ContactsContract.CommonDataKinds.Organization.COMPANY) ?: ""
+                    val jobTitle = cursor.getStringValue(ContactsContract.CommonDataKinds.Organization.TITLE) ?: ""
+                    if (isOrganization && (company.isNotEmpty() || jobTitle.isNotEmpty())) {
+                        return "$company $jobTitle".trim()
+                    }
+                } while (cursor.moveToNext())
             }
         } catch (e: Exception) {
             showErrorToast(e)