From 8edab98cb3d9308d608466b56c0a665834986f9d Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 22 Feb 2018 14:01:54 +0100 Subject: [PATCH] avoid unnecessarily fetching all contact emails and addresses for the main screen --- .../contacts/helpers/ContactsHelper.kt | 69 +++++-------------- 1 file changed, 16 insertions(+), 53 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt index 3041cd1e..133d1154 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/helpers/ContactsHelper.kt @@ -76,22 +76,6 @@ class ContactsHelper(val activity: BaseSimpleActivity) { contacts[key]?.phoneNumbers = phoneNumbers.valueAt(i) } - val emails = getEmails() - size = emails.size() - for (i in 0 until size) { - val key = emails.keyAt(i) - contacts[key]?.emails = emails.valueAt(i) - } - - val addresses = getAddresses() - size = addresses.size() - for (i in 0 until size) { - val key = addresses.keyAt(i) - contacts[key]?.addresses = addresses.valueAt(i) - } - - //getNotes() - activity.dbHelper.getContacts().forEach { contacts.put(it.id, it) } @@ -141,35 +125,27 @@ class ContactsHelper(val activity: BaseSimpleActivity) { return phoneNumbers } - private fun getEmails(contactId: Int? = null): SparseArray> { - val emails = SparseArray>() + private fun getEmails(contactId: Int): ArrayList { + val emails = ArrayList() val uri = CommonDataKinds.Email.CONTENT_URI val projection = arrayOf( - ContactsContract.Data.RAW_CONTACT_ID, CommonDataKinds.Email.DATA, CommonDataKinds.Email.TYPE ) - val selection = if (contactId == null) null else "${ContactsContract.Data.RAW_CONTACT_ID} = ?" - val selectionArgs = if (contactId == null) null else arrayOf(contactId.toString()) + val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ?" + val selectionArgs = arrayOf(contactId.toString()) var cursor: Cursor? = null try { cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null) if (cursor?.moveToFirst() == true) { do { - val id = cursor.getIntValue(ContactsContract.Data.RAW_CONTACT_ID) val email = cursor.getStringValue(CommonDataKinds.Email.DATA) ?: continue val type = cursor.getIntValue(CommonDataKinds.Email.TYPE) - - if (emails[id] == null) { - emails.put(id, ArrayList()) - } - - emails[id]!!.add(Email(email, type)) + emails.add(Email(email, type)) } while (cursor.moveToNext()) } - } catch (e: Exception) { activity.showErrorToast(e) } finally { @@ -179,35 +155,27 @@ class ContactsHelper(val activity: BaseSimpleActivity) { return emails } - private fun getAddresses(contactId: Int? = null): SparseArray> { - val addresses = SparseArray>() + private fun getAddresses(contactId: Int): ArrayList
{ + val addresses = ArrayList
() val uri = CommonDataKinds.StructuredPostal.CONTENT_URI val projection = arrayOf( - ContactsContract.Data.RAW_CONTACT_ID, CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS, CommonDataKinds.StructuredPostal.TYPE ) - val selection = if (contactId == null) null else "${ContactsContract.Data.RAW_CONTACT_ID} = ?" - val selectionArgs = if (contactId == null) null else arrayOf(contactId.toString()) + val selection = "${ContactsContract.Data.RAW_CONTACT_ID} = ?" + val selectionArgs = arrayOf(contactId.toString()) var cursor: Cursor? = null try { cursor = activity.contentResolver.query(uri, projection, selection, selectionArgs, null) if (cursor?.moveToFirst() == true) { do { - val id = cursor.getIntValue(ContactsContract.Data.RAW_CONTACT_ID) val address = cursor.getStringValue(CommonDataKinds.StructuredPostal.FORMATTED_ADDRESS) val type = cursor.getIntValue(CommonDataKinds.StructuredPostal.TYPE) - - if (addresses[id] == null) { - addresses.put(id, ArrayList()) - } - - addresses[id]!!.add(Address(address, type)) + addresses.add(Address(address, type)) } while (cursor.moveToNext()) } - } catch (e: Exception) { activity.showErrorToast(e) } finally { @@ -217,8 +185,8 @@ class ContactsHelper(val activity: BaseSimpleActivity) { return addresses } - private fun getEvents(contactId: Int): SparseArray> { - val events = SparseArray>() + private fun getEvents(contactId: Int): ArrayList { + val events = ArrayList() val uri = ContactsContract.Data.CONTENT_URI val projection = arrayOf( CommonDataKinds.Event.START_DATE, @@ -233,12 +201,7 @@ class ContactsHelper(val activity: BaseSimpleActivity) { do { val startDate = cursor.getStringValue(CommonDataKinds.Event.START_DATE) val type = cursor.getIntValue(CommonDataKinds.Event.TYPE) - - if (events[contactId] == null) { - events.put(contactId, ArrayList()) - } - - events[contactId]!!.add(Event(startDate, type)) + events.add(Event(startDate, type)) } while (cursor.moveToNext()) } } catch (e: Exception) { @@ -291,9 +254,9 @@ class ContactsHelper(val activity: BaseSimpleActivity) { val surname = cursor.getStringValue(CommonDataKinds.StructuredName.FAMILY_NAME) ?: "" val photoUri = cursor.getStringValue(CommonDataKinds.Phone.PHOTO_URI) ?: "" val number = getPhoneNumbers(id)[id] ?: ArrayList() - val emails = getEmails(id)[id] ?: ArrayList() - val addresses = getAddresses(id)[id] ?: ArrayList() - val events = getEvents(id)[id] ?: ArrayList() + val emails = getEmails(id) + val addresses = getAddresses(id) + val events = getEvents(id) val accountName = cursor.getStringValue(ContactsContract.RawContacts.ACCOUNT_NAME) ?: "" val starred = cursor.getIntValue(CommonDataKinds.StructuredName.STARRED) val contactId = cursor.getIntValue(ContactsContract.Data.CONTACT_ID)