From 6e76009174e2e1b12dd91b38c751940b508fc986 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 31 Oct 2017 17:22:52 -0700 Subject: [PATCH] Clean up getContactFromDb --- .../data/repository/ContactRepository.kt | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt index f40cb5a6..91469dd2 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ContactRepository.kt @@ -37,21 +37,21 @@ class ContactRepository @Inject constructor(val context: Context) { } private fun getContactFromDb(recipientId: Long): Contact? { - val recipientCursor = context.contentResolver.query(Uri.withAppendedPath(URI, recipientId.toString()), null, null, null, null) - if (recipientCursor.moveToFirst()) { - val contact = Contact(recipientId, recipientCursor.getString(0)) + context.contentResolver.query(Uri.withAppendedPath(URI, recipientId.toString()), null, null, null, null)?.use { recipientCursor -> + if (recipientCursor.moveToFirst()) { + val contact = Contact(recipientId, recipientCursor.getString(0)) - val contactUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(contact.address)) - val projection = arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME, ContactsContract.Data.PHOTO_THUMBNAIL_URI) - val contactCursor = context.contentResolver.query(contactUri, projection, null, null, null) - if (contactCursor.moveToFirst()) { - contact.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.DISPLAY_NAME)).orEmpty() - contact.photoUri = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.PHOTO_THUMBNAIL_URI)).orEmpty() + val contactUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(contact.address)) + val projection = arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME, ContactsContract.Data.PHOTO_THUMBNAIL_URI) + context.contentResolver.query(contactUri, projection, null, null, null).use { contactCursor -> + if (contactCursor.moveToFirst()) { + contact.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.DISPLAY_NAME)).orEmpty() + contact.photoUri = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Data.PHOTO_THUMBNAIL_URI)).orEmpty() + } + } + return contact } - contactCursor.close() - return contact } - recipientCursor.close() return null }