From ade0e86116b41ee3d7821afc5ab894b0742ba37b Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Sun, 26 Jun 2022 09:41:22 +0200
Subject: [PATCH] take Default number into consideration at new conversations

---
 .../activities/NewConversationActivity.kt     | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
index 17465aac..acaff574 100644
--- a/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/smsmessenger/activities/NewConversationActivity.kt
@@ -145,14 +145,19 @@ class NewConversationActivity : SimpleActivity() {
                 val contact = it as SimpleContact
                 val phoneNumbers = contact.phoneNumbers
                 if (phoneNumbers.size > 1) {
-                    val items = ArrayList<RadioItem>()
-                    phoneNumbers.forEachIndexed { index, phoneNumber ->
-                        val type = getPhoneNumberTypeText(phoneNumber.type, phoneNumber.label)
-                        items.add(RadioItem(index, "${phoneNumber.normalizedNumber} ($type)", phoneNumber.normalizedNumber))
-                    }
+                    val primaryNumber = contact.phoneNumbers.find { it.isPrimary }
+                    if (primaryNumber != null) {
+                        launchThreadActivity(primaryNumber.value, contact.name)
+                    } else {
+                        val items = ArrayList<RadioItem>()
+                        phoneNumbers.forEachIndexed { index, phoneNumber ->
+                            val type = getPhoneNumberTypeText(phoneNumber.type, phoneNumber.label)
+                            items.add(RadioItem(index, "${phoneNumber.normalizedNumber} ($type)", phoneNumber.normalizedNumber))
+                        }
 
-                    RadioGroupDialog(this, items) {
-                        launchThreadActivity(it as String, contact.name)
+                        RadioGroupDialog(this, items) {
+                            launchThreadActivity(it as String, contact.name)
+                        }
                     }
                 } else {
                     launchThreadActivity(phoneNumbers.first().normalizedNumber, contact.name)