handle retrieving local contacts from the database

This commit is contained in:
tibbi
2018-11-05 21:31:30 +01:00
parent 644a6a2e00
commit f7c1f0ab10
7 changed files with 58 additions and 15 deletions

View File

@@ -37,7 +37,7 @@ class ContactsHelper(val activity: Activity) {
getDeviceContacts(contacts)
if (displayContactSources.contains(SMT_PRIVATE)) {
activity.dbHelper.getContacts(activity).forEach {
LocalContactsHelper(activity).getAllContacts().forEach {
contacts.put(it.id, it)
}
}
@@ -754,7 +754,7 @@ class ContactsHelper(val activity: Activity) {
if (id == 0) {
return null
} else if (isLocalPrivate) {
return activity.dbHelper.getContactWithId(activity, id)
return LocalContactsHelper(activity).getContactWithId(id)
}
val selection = "${ContactsContract.Data.MIMETYPE} = ? AND ${ContactsContract.Data.RAW_CONTACT_ID} = ?"

View File

@@ -1,17 +1,59 @@
package com.simplemobiletools.contacts.pro.helpers
import android.app.Activity
import com.simplemobiletools.contacts.pro.extensions.applyRegexFiltering
import com.simplemobiletools.contacts.pro.extensions.config
import com.simplemobiletools.contacts.pro.extensions.contactsDB
import com.simplemobiletools.contacts.pro.extensions.getEmptyContact
import com.simplemobiletools.contacts.pro.models.Contact
import com.simplemobiletools.contacts.pro.models.LocalContact
import com.simplemobiletools.contacts.pro.models.Organization
import com.simplemobiletools.contacts.pro.models.PhoneNumber
class LocalContactsHelper(val activity: Activity) {
fun getAllContacts() = activity.contactsDB.getContacts().map { convertLocalContactToContact(it) }.toMutableList() as ArrayList<Contact>
fun getContactWithId(id: Int) = convertLocalContactToContact(activity.contactsDB.getContactWithId(id))
fun insertContact(contact: Contact): Boolean {
val localContact = convertContactToLocalContact(contact)
activity.contactsDB.insertOrUpdate(localContact)
return true
}
private fun convertLocalContactToContact(localContact: LocalContact): Contact {
val filterDuplicates = activity.config.filterDuplicates
val filteredPhoneNumbers = ArrayList<PhoneNumber>()
if (filterDuplicates) {
localContact.phoneNumbers.mapTo(filteredPhoneNumbers) { PhoneNumber(it.value.applyRegexFiltering(), 0, "") }
}
return activity.getEmptyContact().apply {
id = localContact.id!!
prefix = localContact.prefix
firstName = localContact.firstName
middleName = localContact.middleName
surname = localContact.surname
suffix = localContact.suffix
nickname = localContact.nickname
photoUri = ""
phoneNumbers = localContact.phoneNumbers
emails = localContact.emails
addresses = localContact.addresses
events = localContact.events
source = SMT_PRIVATE
starred = localContact.starred
contactId = localContact.id!!
thumbnailUri = ""
notes = localContact.notes
groups = localContact.groups
organization = Organization(localContact.company, localContact.jobPosition)
websites = localContact.websites
cleanPhoneNumbers = filteredPhoneNumbers
IMs = localContact.IMs
}
}
private fun convertContactToLocalContact(contact: Contact): LocalContact {
return getEmptyLocalContact().apply {
id = if (contact.id == 0) null else contact.id
@@ -31,7 +73,7 @@ class LocalContactsHelper(val activity: Activity) {
company = contact.organization.company
jobPosition = contact.organization.jobPosition
websites = contact.websites
ims = contact.IMs
IMs = contact.IMs
}
}
}