fenix/Simple-Contacts
1
0
Fork 0
mirror of https://github.com/SimpleMobileTools/Simple-Contacts.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

show all available contact phone numbers at View screen

Browse Source
This commit is contained in:
tibbi
2019-09-15 11:26:04 +02:00
parent 5827f2c64f
commit 128f191264
1 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
View File

@ -18,6 +18,7 @@ import com.simplemobiletools.contacts.pro.dialogs.CallConfirmationDialog
import com.simplemobiletools.contacts.pro.extensions.* import com.simplemobiletools.contacts.pro.extensions.*
import com.simplemobiletools.contacts.pro.helpers.* import com.simplemobiletools.contacts.pro.helpers.*
import com.simplemobiletools.contacts.pro.models.Contact import com.simplemobiletools.contacts.pro.models.Contact
import com.simplemobiletools.contacts.pro.models.PhoneNumber
import kotlinx.android.synthetic.main.activity_view_contact.* import kotlinx.android.synthetic.main.activity_view_contact.*
import kotlinx.android.synthetic.main.item_event.view.* import kotlinx.android.synthetic.main.item_event.view.*
import kotlinx.android.synthetic.main.item_view_address.view.* import kotlinx.android.synthetic.main.item_view_address.view.*
@ -32,6 +33,7 @@ class ViewContactActivity : ContactActivity() {
private var isViewIntent = false private var isViewIntent = false
private var wasEditLaunched = false private var wasEditLaunched = false
private var shownContactSources = ArrayList<String>() private var shownContactSources = ArrayList<String>()
private var duplicateContacts = ArrayList<Contact>()
private var showFields = 0 private var showFields = 0
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
@ -196,7 +198,12 @@ class ViewContactActivity : ContactActivity() {
window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN) window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN)
setupFavorite() setupFavorite()
setupNames() setupNames()
setupContactSources()
getDuplicateContacts {
setupPhoneNumbers() setupPhoneNumbers()
}
setupEmails() setupEmails()
setupAddresses() setupAddresses()
setupIMs() setupIMs()
@ -205,8 +212,6 @@ class ViewContactActivity : ContactActivity() {
setupOrganization() setupOrganization()
setupWebsites() setupWebsites()
setupGroups() setupGroups()
setupContactSources()
checkDuplicateContacts()
} }
private fun launchEditContact(contact: Contact) { private fun launchEditContact(contact: Contact) {
@ -274,7 +279,21 @@ class ViewContactActivity : ContactActivity() {
private fun setupPhoneNumbers() { private fun setupPhoneNumbers() {
contact_numbers_holder.removeAllViews() contact_numbers_holder.removeAllViews()
val phoneNumbers = contact!!.phoneNumbers var phoneNumbers = contact!!.phoneNumbers.toMutableSet() as LinkedHashSet<PhoneNumber>
duplicateContacts.forEach {
it.phoneNumbers.forEach {
phoneNumbers.add(it)
}
}
phoneNumbers = phoneNumbers.distinctBy {
if (it.normalizedNumber != null && it.normalizedNumber!!.length >= 7) {
it.normalizedNumber?.substring(it.normalizedNumber!!.length - 7)
} else {
it.normalizedNumber
}
}.toMutableSet() as LinkedHashSet<PhoneNumber>
if (phoneNumbers.isNotEmpty() && showFields and SHOW_PHONE_NUMBERS_FIELD != 0) { if (phoneNumbers.isNotEmpty() && showFields and SHOW_PHONE_NUMBERS_FIELD != 0) {
phoneNumbers.forEach { phoneNumbers.forEach {
layoutInflater.inflate(R.layout.item_view_phone_number, contact_numbers_holder, false).apply { layoutInflater.inflate(R.layout.item_view_phone_number, contact_numbers_holder, false).apply {
@ -480,19 +499,21 @@ class ViewContactActivity : ContactActivity() {
} }
} }
private fun checkDuplicateContacts() { private fun getDuplicateContacts(callback: () -> Unit) {
ContactsHelper(this).getDuplicatesOfContact(contact!!, false) { contacts -> ContactsHelper(this).getDuplicatesOfContact(contact!!, false) { contacts ->
ensureBackgroundThread { ensureBackgroundThread {
val duplicates = ArrayList<Contact>() duplicateContacts.clear()
contacts.forEach { contacts.forEach {
val duplicate = ContactsHelper(this).getContactWithId(it.id, it.isPrivate()) val duplicate = ContactsHelper(this).getContactWithId(it.id, it.isPrivate())
if (duplicate != null) { if (duplicate != null) {
duplicates.add(duplicate) duplicateContacts.add(duplicate)
} }
} }
val currContactSources = duplicates.map { it.source }
runOnUiThread { runOnUiThread {
callback()
val currContactSources = duplicateContacts.map { it.source }
if (currContactSources.toString() != shownContactSources.toString()) { if (currContactSources.toString() != shownContactSources.toString()) {
for (i in (contact_sources_holder.childCount - 1) downTo 1) { for (i in (contact_sources_holder.childCount - 1) downTo 1) {
contact_sources_holder.removeView(contact_sources_holder.getChildAt(i)) contact_sources_holder.removeView(contact_sources_holder.getChildAt(i))
@ -501,7 +522,7 @@ class ViewContactActivity : ContactActivity() {
} }
if (shownContactSources.isEmpty()) { if (shownContactSources.isEmpty()) {
duplicates.forEach { duplicateContacts.forEach {
addContactSource(it) addContactSource(it)
shownContactSources.add(it.source) shownContactSources.add(it.source)
} }