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

tweak duplicate contact source adding a bit

Browse Source
This commit is contained in:
tibbi
2019-09-14 22:38:20 +02:00
parent a35e0513be
commit 2dc2fe01df
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -482,7 +482,16 @@ class ViewContactActivity : ContactActivity() {
private fun checkDuplicateContacts() { private fun checkDuplicateContacts() {
ContactsHelper(this).getDuplicatesOfContact(contact!!, false) { contacts -> ContactsHelper(this).getDuplicatesOfContact(contact!!, false) { contacts ->
val currContactSources = contacts.map { it.source } ensureBackgroundThread {
val duplicates = ArrayList<Contact>()
contacts.forEach {
val duplicate = ContactsHelper(this).getContactWithId(it.id, it.isPrivate())
if (duplicate != null) {
duplicates.add(duplicate)
}
}
val currContactSources = duplicates.map { it.source }
runOnUiThread { runOnUiThread {
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) {
@@ -492,7 +501,7 @@ class ViewContactActivity : ContactActivity() {
} }
if (shownContactSources.isEmpty()) { if (shownContactSources.isEmpty()) {
contacts.forEach { duplicates.forEach {
addContactSource(it) addContactSource(it)
shownContactSources.add(it.source) shownContactSources.add(it.source)
} }
@@ -500,6 +509,7 @@ class ViewContactActivity : ContactActivity() {
} }
} }
} }
}
private fun addContactSource(contact: Contact) { private fun addContactSource(contact: Contact) {
if (showFields and SHOW_CONTACT_SOURCE_FIELD != 0) { if (showFields and SHOW_CONTACT_SOURCE_FIELD != 0) {