diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt index 2bcec6eb..8b80415b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt @@ -36,6 +36,8 @@ class ViewContactActivity : ContactActivity() { private var duplicateContacts = ArrayList() private var showFields = 0 + private val COMPARABLE_PHONE_NUMBER_LENGTH = 7 + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_view_contact) @@ -278,22 +280,20 @@ class ViewContactActivity : ContactActivity() { } private fun setupPhoneNumbers() { - contact_numbers_holder.removeAllViews() var phoneNumbers = contact!!.phoneNumbers.toMutableSet() as LinkedHashSet duplicateContacts.forEach { - it.phoneNumbers.forEach { - phoneNumbers.add(it) - } + phoneNumbers.addAll(it.phoneNumbers) } phoneNumbers = phoneNumbers.distinctBy { - if (it.normalizedNumber != null && it.normalizedNumber!!.length >= 7) { - it.normalizedNumber?.substring(it.normalizedNumber!!.length - 7) + if (it.normalizedNumber != null && it.normalizedNumber!!.length >= COMPARABLE_PHONE_NUMBER_LENGTH) { + it.normalizedNumber?.substring(it.normalizedNumber!!.length - COMPARABLE_PHONE_NUMBER_LENGTH) } else { it.normalizedNumber } }.toMutableSet() as LinkedHashSet + contact_numbers_holder.removeAllViews() if (phoneNumbers.isNotEmpty() && showFields and SHOW_PHONE_NUMBERS_FIELD != 0) { phoneNumbers.forEach { layoutInflater.inflate(R.layout.item_view_phone_number, contact_numbers_holder, false).apply {