wbrawner/Simple-Contacts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

at deleting a contact delete all duplicates too

Browse source
This commit is contained in:
tibbi 2019-09-11 23:07:53 +02:00
parent 797df0a2d7
commit 8fdb6ee0a8
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/ViewContactActivity.kt
View file

@ -477,7 +477,7 @@ class ViewContactActivity : ContactActivity() {
}
addContactSource(contact!!)
ContactsHelper(this).getDuplicatesOfContact(contact!!) { contacts ->
ContactsHelper(this).getDuplicatesOfContact(contact!!, false) { contacts ->
runOnUiThread {
contacts.forEach {
addContactSource(it)

15
app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/ContactsHelper.kt
View file

@ -1524,13 +1524,9 @@ class ContactsHelper(val context: Context) {
LocalContactsHelper(context).toggleFavorites(localContacts, addToFavorites)
}
fun deleteContact(contact: Contact) {
ensureBackgroundThread {
if (contact.isPrivate()) {
context.contactsDB.deleteContactId(contact.id)
} else {
deleteContacts(arrayListOf(contact))
}
fun deleteContact(originalContact: Contact) {
getDuplicatesOfContact(originalContact, true) { contacts ->
deleteContacts(contacts)
}
}
@ -1562,10 +1558,13 @@ class ContactsHelper(val context: Context) {
}
}
fun getDuplicatesOfContact(contact: Contact, callback: (ArrayList<Contact>) -> Unit) {
fun getDuplicatesOfContact(contact: Contact, addOriginal: Boolean, callback: (ArrayList<Contact>) -> Unit) {
ensureBackgroundThread {
getContacts { contacts ->
val duplicates = contacts.filter { it.id != contact.id && it.getHashToCompare() == contact.getHashToCompare() }.toMutableList() as ArrayList<Contact>
if (addOriginal) {
duplicates.add(contact)
}
callback(duplicates)
}
}