From 5213998c9c4b1b2f83d59473cd79e063215ad21a Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 14 Dec 2017 20:18:16 -0500 Subject: [PATCH] Sync contacts during partial sync --- .../QKSMS/data/mapper/CursorToRecipient.kt | 5 +- .../java/com/moez/QKSMS/data/model/Contact.kt | 10 ++-- .../com/moez/QKSMS/data/model/Conversation.kt | 2 +- .../com/moez/QKSMS/data/model/PhoneNumber.kt | 10 ++++ .../com/moez/QKSMS/data/model/Recipient.kt | 2 + .../data/repository/ContactRepository.kt | 53 ++++++++----------- .../moez/QKSMS/domain/interactor/FullSync.kt | 9 +++- .../QKSMS/domain/interactor/PartialSync.kt | 3 +- .../presentation/common/widget/AvatarView.kt | 4 +- .../presentation/compose/ChipsAdapter.kt | 2 +- .../presentation/compose/ComposeViewModel.kt | 4 +- .../presentation/compose/ContactAdapter.kt | 4 +- .../presentation/compose/DetailedChipView.kt | 2 +- .../presentation/compose/MessagesAdapter.kt | 7 +-- .../presentation/main/ConversationsAdapter.kt | 5 +- 15 files changed, 69 insertions(+), 53 deletions(-) create mode 100644 qksms/src/main/java/com/moez/QKSMS/data/model/PhoneNumber.kt diff --git a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToRecipient.kt b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToRecipient.kt index cbce8f17..676049c0 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToRecipient.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/mapper/CursorToRecipient.kt @@ -3,9 +3,10 @@ package com.moez.QKSMS.data.mapper import android.database.Cursor import android.net.Uri import com.moez.QKSMS.data.model.Recipient +import com.moez.QKSMS.data.repository.ContactRepository import javax.inject.Inject -class CursorToRecipient @Inject constructor() : Mapper { +class CursorToRecipient @Inject constructor(private val contactRepository: ContactRepository) : Mapper { companion object { val URI = Uri.parse("content://mms-sms/canonical-addresses") @@ -17,6 +18,8 @@ class CursorToRecipient @Inject constructor() : Mapper { override fun map(from: Cursor) = Recipient().apply { id = from.getLong(COLUMN_ID) address = from.getString(COLUMN_ADDRESS) + contact = contactRepository.getContactBlocking(address) // TODO do this lazily for faster syncs + lastUpdate = System.currentTimeMillis() } } \ No newline at end of file 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 5354739a..6472ffea 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 @@ -1,15 +1,13 @@ package com.moez.QKSMS.data.model +import io.realm.RealmList import io.realm.RealmObject -import io.realm.annotations.PrimaryKey -open class Contact() : RealmObject() { +open class Contact : RealmObject() { - @PrimaryKey var recipientId: Long = 0 var lookupKey: String = "" - var address: String = "" + var numbers: RealmList = RealmList() var name: String = "" - - var inContactsTable: Boolean = false + var lastUpdate: Long = 0 } \ No newline at end of file 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 f7e3639a..383125d1 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 @@ -13,7 +13,7 @@ open class Conversation : RealmObject() { fun getTitle(): String { var title = "" recipients.forEachIndexed { index, recipient -> - title += recipient.address + title += recipient.contact?.name ?: recipient.address if (index < recipients.size - 1) { title += ", " } diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/PhoneNumber.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/PhoneNumber.kt new file mode 100644 index 00000000..8ffdebe9 --- /dev/null +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/PhoneNumber.kt @@ -0,0 +1,10 @@ +package com.moez.QKSMS.data.model + +import io.realm.RealmObject + +open class PhoneNumber : RealmObject() { + + var address: String = "" + var label: String = "" + +} \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt b/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt index 3a2b5018..ae6083f3 100644 --- a/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt +++ b/qksms/src/main/java/com/moez/QKSMS/data/model/Recipient.kt @@ -7,5 +7,7 @@ open class Recipient : RealmObject() { @PrimaryKey var id: Long = 0 var address: String = "" + var contact: Contact? = null + var lastUpdate: Long = 0 } \ No newline at end of file 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 a3cf8d0d..a9ba63e0 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 @@ -6,6 +6,7 @@ import android.provider.BaseColumns import android.provider.ContactsContract import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.data.model.PhoneNumber import io.reactivex.Flowable import io.reactivex.Single import io.realm.Realm @@ -16,11 +17,6 @@ import javax.inject.Singleton @Singleton class ContactRepository @Inject constructor(val context: Context) { - /** - * Uri for the MMS-SMS recipients table, where there exists only one column (address) - */ - private val URI = Uri.parse("content://mms-sms/canonical-address") - fun findContactUri(address: String): Single { return Flowable.just(address) .map { address -> Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) } @@ -34,54 +30,49 @@ class ContactRepository @Inject constructor(val context: Context) { val realm = Realm.getDefaultInstance() val results = realm.copyFromRealm(realm .where(Contact::class.java) - .equalTo("inContactsTable", true) .findAllSorted("name")) realm.close() return results } - fun getContact(recipientId: Long): Flowable { + fun getContact(address: String): Flowable { return Flowable.fromPublisher { emitter -> - val contact = getContactFromRealm(recipientId) ?: getContactFromDb(recipientId) - contact?.let { emitter.onNext(it) } + getContactBlocking(address)?.let { emitter.onNext(it) } emitter.onComplete() } } - private fun getContactFromRealm(recipientId: Long): Contact? { + fun getContactBlocking(address: String): Contact? { + return getContactFromRealm(address) ?: getContactFromDb(address) + } + + private fun getContactFromRealm(address: String): Contact? { val realm = Realm.getDefaultInstance() val results = realm.where(Contact::class.java) - .equalTo("recipientId", recipientId) + .equalTo("numbers.address", address) .findAll() realm.close() return results.getOrNull(0) } - private fun getContactFromDb(recipientId: Long): Contact? { - context.contentResolver.query(Uri.withAppendedPath(URI, recipientId.toString()), null, null, null, null)?.use { recipientCursor -> - if (recipientCursor.moveToFirst()) { - val contact = Contact().apply { - this.recipientId = recipientId - this.address = 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.PhoneLookup.LOOKUP_KEY) - try { - context.contentResolver.query(contactUri, projection, null, null, null).use { contactCursor -> - if (contactCursor.moveToFirst()) { - contact.inContactsTable = true - contact.name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.PhoneLookup.DISPLAY_NAME)).orEmpty() - contact.lookupKey = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.PhoneLookup.LOOKUP_KEY)).orEmpty() - } + private fun getContactFromDb(address: String): Contact? { + val contactUri = Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) + val projection = arrayOf(BaseColumns._ID, ContactsContract.PhoneLookup.DISPLAY_NAME, ContactsContract.PhoneLookup.LOOKUP_KEY) + try { + context.contentResolver.query(contactUri, projection, null, null, null).use { contactCursor -> + if (contactCursor.moveToFirst()) { + return Contact().apply { + numbers.add(PhoneNumber().apply { this.address = address }) + name = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.PhoneLookup.DISPLAY_NAME)).orEmpty() + lookupKey = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.PhoneLookup.LOOKUP_KEY)).orEmpty() + lastUpdate = System.currentTimeMillis() } - } catch (e: Exception) { - Timber.w(e) } - return contact } + } catch (e: Exception) { + Timber.w(e) } return null diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/FullSync.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/FullSync.kt index c50b1dd5..11d5d77b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/FullSync.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/FullSync.kt @@ -4,6 +4,9 @@ import android.content.Context import com.moez.QKSMS.data.mapper.CursorToConversation import com.moez.QKSMS.data.mapper.CursorToMessage import com.moez.QKSMS.data.mapper.CursorToRecipient +import com.moez.QKSMS.data.model.Conversation +import com.moez.QKSMS.data.model.Message +import com.moez.QKSMS.data.model.Recipient import io.reactivex.Flowable import io.realm.Realm import javax.inject.Inject @@ -17,7 +20,11 @@ class FullSync @Inject constructor( override fun buildObservable(params: Unit): Flowable { val realm = Realm.getDefaultInstance() - realm.executeTransaction { realm.deleteAll() } + realm.executeTransaction { + realm.delete(Conversation::class.java) + realm.delete(Message::class.java) + realm.delete(Recipient::class.java) + } realm.close() return super.buildObservable(params) diff --git a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt index ee98a50d..64ddf125 100644 --- a/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt +++ b/qksms/src/main/java/com/moez/QKSMS/domain/interactor/PartialSync.kt @@ -29,6 +29,7 @@ open class PartialSync @Inject constructor( return Flowable.just(params) .doOnNext { + Timber.v("Starting sync") startTime = System.currentTimeMillis() // We need to set up realm on the io thread, and doOnSubscribe doesn't support setting a custom Scheduler @@ -70,7 +71,7 @@ open class PartialSync @Inject constructor( .doOnNext { realm?.commitTransaction() realm?.close() - Timber.v("Performed sync in ${TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - startTime)} seconds") + Timber.v("Completed sync in ${TimeUnit.MILLISECONDS.toSeconds(System.currentTimeMillis() - startTime)} seconds") } .map { 0L } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt index 2e285009..50c1b0b7 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/common/widget/AvatarView.kt @@ -77,8 +77,8 @@ class AvatarView @JvmOverloads constructor(context: Context, attrs: AttributeSet } photo.setImageDrawable(null) - contact?.let { contact -> - GlideApp.with(photo).load(PhoneNumberUtils.stripSeparators(contact.address)).into(photo) + contact?.numbers?.firstOrNull()?.address?.let { address -> + GlideApp.with(photo).load(PhoneNumberUtils.stripSeparators(address)).into(photo) } } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt index 6fb737e1..b125053a 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ChipsAdapter.kt @@ -116,6 +116,6 @@ class ChipsAdapter @Inject constructor(private val context: Context) : QkAdapter } override fun areItemsTheSame(old: Contact, new: Contact): Boolean { - return old.recipientId == new.recipientId + return old.lookupKey == new.lookupKey } } diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt index 192038b6..23f2ccc5 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ComposeViewModel.kt @@ -56,7 +56,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel( // Map the selected contacts to a conversation so that we can display the message history val selectedConversation = selectedContacts - .map { contacts -> contacts.map { it.address } } + .map { contacts -> contacts.map { it.numbers.firstOrNull()?.address ?: "" } } .flatMapMaybe { addresses -> messageRepo.getOrCreateConversation(addresses) } // Merges two potential conversation sources (threadId from constructor and contact selection) into a single @@ -116,7 +116,7 @@ class ComposeViewModel(threadId: Long) : QkViewModel( contacts .filterNot { contact -> selectedContacts.contains(contact) } .filter { contact -> - contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.address, query.toString()) + contact.name.contains(query, true) || PhoneNumberUtils.compare(contact.numbers.firstOrNull()?.address, query.toString()) } }) .subscribeOn(Schedulers.computation()) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt index 2314d31c..abf3cfca 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/ContactAdapter.kt @@ -32,11 +32,11 @@ class ContactAdapter @Inject constructor(private val context: Context) : QkAdapt view.avatar.contact = contact view.name.text = contact.name - view.address.text = contact.address + view.address.text = contact.numbers.map { it.address }.toString() } override fun areItemsTheSame(old: Contact, new: Contact): Boolean { - return old.recipientId == new.recipientId + return old.lookupKey == new.lookupKey } } \ No newline at end of file diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt index 7970fae5..cf973f15 100755 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/DetailedChipView.kt @@ -47,7 +47,7 @@ class DetailedChipView(context: Context) : RelativeLayout(context) { fun setContact(contact: Contact) { avatar.contact = contact name.text = contact.name - info.text = contact.address + info.text = contact.numbers.map { it.address }.toString() } fun show() { diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt index 1da5ea18..51a40f05 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/compose/MessagesAdapter.kt @@ -14,6 +14,7 @@ import com.moez.QKSMS.common.util.extensions.setBackgroundTint import com.moez.QKSMS.common.util.extensions.setPadding import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.Message +import com.moez.QKSMS.data.model.PhoneNumber import com.moez.QKSMS.presentation.common.base.QkViewHolder import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.plusAssign @@ -60,9 +61,9 @@ class MessagesAdapter @Inject constructor( } if (viewType != VIEWTYPE_ME) { - val contact = Contact() - contact.address = people[viewType] - view.avatar.contact = contact + view.avatar.contact = Contact().apply { + numbers.add(PhoneNumber().apply { address = people[viewType] }) + } } return QkViewHolder(view) diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt index c2614c1e..42fd8436 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/main/ConversationsAdapter.kt @@ -10,6 +10,7 @@ import com.moez.QKSMS.common.util.Colors import com.moez.QKSMS.common.util.DateFormatter import com.moez.QKSMS.data.model.Contact import com.moez.QKSMS.data.model.InboxItem +import com.moez.QKSMS.data.model.PhoneNumber import com.moez.QKSMS.data.repository.MessageRepository import com.moez.QKSMS.presentation.Navigator import com.moez.QKSMS.presentation.common.base.FlowableAdapter @@ -63,7 +64,9 @@ class ConversationsAdapter @Inject constructor( RxView.clicks(view).subscribe { navigator.showConversation(message.threadId) } RxView.longClicks(view).subscribe { longClicks.onNext(conversation.id) } - view.avatars.contacts = conversation.recipients.map { recipient -> Contact().apply { address = recipient.address } } + view.avatars.contacts = conversation.recipients.map { recipient -> + recipient.contact ?: Contact().apply { numbers.add(PhoneNumber().apply { address = recipient.address }) } + } view.title.text = conversation.getTitle() view.date.text = dateFormatter.getConversationTimestamp(message.date) view.snippet.text = message.body