From 15c6cc159d62d07b59be0d379be433313d74ae13 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Mon, 28 Aug 2017 16:18:04 -0700 Subject: [PATCH] load contact from realm if possible --- .../java/com/moez/QKSMS/data/model/Contact.kt | 4 +-- .../com/moez/QKSMS/data/model/Conversation.kt | 4 +-- .../data/repository/ContactRepository.kt | 35 +++++++++++++++++-- .../data/repository/ConversationRepository.kt | 2 +- 4 files changed, 37 insertions(+), 8 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt index 1d155ffa..0c60ae09 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Contact.kt @@ -5,14 +5,14 @@ import io.realm.annotations.PrimaryKey open class Contact() : RealmObject() { - @PrimaryKey var id: Long = 0 + @PrimaryKey var recipientId: Long = 0 var address: String = "" /** * For inflating the contact using the cursor */ constructor(id: Long, address: String) : this() { - this.id = id + this.recipientId = id this.address = address } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt index 31a2f94d..44f543a8 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Conversation.kt @@ -30,8 +30,8 @@ open class Conversation() : RealmObject() { Flowable.fromIterable(cursor.getString(ConversationColumns.RECIPIENT_IDS).split(" ")) .map { id -> id.toLong() } - .map { id -> contacts.getContactBlocking(id) } - .filter { contact -> contact.id != 0L } + .map { id -> contacts.getContact(id) } + .filter { contact -> contact.recipientId != 0L } .blockingSubscribe { contact -> this.contacts.add(contact) } snippet = cursor.getString(ConversationColumns.SNIPPET) ?: "" 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 b7586c79..11615f5d 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 @@ -4,6 +4,7 @@ import android.content.ContentUris import android.content.Context import android.net.Uri import com.moez.QKSMS.data.model.Contact +import io.realm.Realm class ContactRepository(val context: Context) { @@ -12,14 +13,42 @@ class ContactRepository(val context: Context) { */ private val URI = Uri.parse("content://mms-sms/canonical-address") - fun getContactBlocking(recipientId: Long): Contact { + /** + * This function is not asynchronous, and potentially very slow. Make sure to + * execute off of the main thread. At the time of writing + */ + fun getContact(recipientId: Long): Contact { + var contact: Contact? = getContactFromRealm(recipientId) + if (contact == null) { + contact = getContactFromContentProvider(recipientId) + } + + return contact ?: Contact() + } + + private fun getContactFromRealm(recipientId: Long): Contact? { + val realm = Realm.getDefaultInstance() + val results = realm.where(Contact::class.java) + .equalTo("recipientId", recipientId) + .findAll() + + if (results.size > 0) { + return results[0] + } + + return null + } + + private fun getContactFromContentProvider(recipientId: Long): Contact? { + var contact: Contact? = null + val cursor = context.contentResolver.query(ContentUris.withAppendedId(URI, recipientId), null, null, null, null) if (cursor.moveToFirst()) { - return Contact(recipientId, cursor.getString(0)) + contact = Contact(recipientId, cursor.getString(0)) } cursor.close() - return Contact() + return contact } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt b/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt index 0ada43ad..0dda594b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/repository/ConversationRepository.kt @@ -9,7 +9,7 @@ class ConversationRepository { fun getConversation(threadId: Long): RealmResults { return Realm.getDefaultInstance() .where(Conversation::class.java) - .equalTo("id", threadId) + .equalTo("recipientId", threadId) .findAllAsync() }