From e300434608885e200ef95ee2e91cd607008be699 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Wed, 1 Nov 2017 22:14:19 -0700 Subject: [PATCH] Use Uri to load Contact photos in AvatarView --- .../com/moez/QKSMS/common/di/AppComponent.kt | 2 +- .../QKSMS/common/util/ContactImageLoader.kt | 30 +++++++------------ .../moez/QKSMS/common/util/GlideAppModule.kt | 3 +- .../data/repository/ContactRepository.kt | 15 ++++++++-- .../QKSMS/presentation/view/AvatarView.kt | 16 ++++++++-- 5 files changed, 41 insertions(+), 25 deletions(-) diff --git a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt index 577c89b9..6a9ed2ac 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/di/AppComponent.kt @@ -1,8 +1,8 @@ package com.moez.QKSMS.common.di import com.moez.QKSMS.common.util.NotificationManager -import com.moez.QKSMS.presentation.main.MainActivity import com.moez.QKSMS.presentation.main.ConversationsAdapter +import com.moez.QKSMS.presentation.main.MainActivity import com.moez.QKSMS.presentation.main.MainViewModel import com.moez.QKSMS.presentation.messages.MessagesActivity import com.moez.QKSMS.presentation.messages.MessagesAdapter diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt index 3792bfe6..5abe9f9c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/ContactImageLoader.kt @@ -3,8 +3,6 @@ package com.moez.QKSMS.common.util import android.content.Context import android.net.Uri import android.provider.ContactsContract -import android.provider.ContactsContract.PhoneLookup -import android.telephony.PhoneNumberUtils import com.bumptech.glide.Priority import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.Key @@ -13,34 +11,33 @@ import com.bumptech.glide.load.data.DataFetcher import com.bumptech.glide.load.model.ModelLoader import com.bumptech.glide.load.model.ModelLoaderFactory import com.bumptech.glide.load.model.MultiModelLoaderFactory -import com.moez.QKSMS.common.util.extensions.asFlowable -import io.reactivex.Flowable +import io.reactivex.Maybe import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers import java.io.InputStream import java.security.MessageDigest -class ContactImageLoader(val context: Context) : ModelLoader { +class ContactImageLoader(val context: Context) : ModelLoader { - override fun handles(model: String?): Boolean { - return PhoneNumberUtils.isGlobalPhoneNumber(model) + override fun handles(model: Uri?): Boolean { + return model.toString().startsWith("content://com.android.contacts/contacts/") } - override fun buildLoadData(model: String?, width: Int, height: Int, options: Options?): ModelLoader.LoadData { - return ModelLoader.LoadData(ContactImageKey(model.orEmpty()), ContactImageFetcher(context, model.orEmpty())) + override fun buildLoadData(model: Uri, width: Int, height: Int, options: Options?): ModelLoader.LoadData { + return ModelLoader.LoadData(ContactImageKey(model), ContactImageFetcher(context, model)) } - class Factory(val context: Context) : ModelLoaderFactory { + class Factory(val context: Context) : ModelLoaderFactory { override fun build(multiFactory: MultiModelLoaderFactory) = ContactImageLoader(context) override fun teardown() {} // nothing to do here } - class ContactImageKey(val address: String) : Key { - override fun updateDiskCacheKey(digest: MessageDigest) = digest.update(address.toByteArray()) + class ContactImageKey(private val contactUri: Uri) : Key { + override fun updateDiskCacheKey(digest: MessageDigest) = digest.update(contactUri.toString().toByteArray()) } - class ContactImageFetcher(val context: Context, val address: String) : DataFetcher { + class ContactImageFetcher(private val context: Context, private val contactUri: Uri) : DataFetcher { private var loadPhotoDisposable: Disposable? = null @@ -49,12 +46,7 @@ class ContactImageLoader(val context: Context) : ModelLoader) { - loadPhotoDisposable = Flowable.just(address) - .map { address -> Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) } - .flatMap { uri -> context.contentResolver.query(uri, arrayOf(PhoneLookup._ID), null, null, null).asFlowable() } - .firstOrError() - .map { cursor -> cursor.getString(cursor.getColumnIndexOrThrow(PhoneLookup._ID)) } - .map { id -> Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) } + loadPhotoDisposable = Maybe.just(contactUri) .map { uri -> ContactsContract.Contacts.openContactPhotoInputStream(context.contentResolver, uri) } .subscribeOn(Schedulers.io()) .subscribe( diff --git a/qksms/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt b/qksms/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt index a82c50f6..ca83418c 100644 --- a/qksms/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt +++ b/qksms/src/main/java/com/moez/QKSMS/common/util/GlideAppModule.kt @@ -1,6 +1,7 @@ package com.moez.QKSMS.common.util import android.content.Context +import android.net.Uri import android.util.Log import com.bumptech.glide.Glide import com.bumptech.glide.GlideBuilder @@ -17,7 +18,7 @@ class GlideAppModule : AppGlideModule() { } override fun registerComponents(context: Context, glide: Glide, registry: Registry) { - registry.append(String::class.java, InputStream::class.java, ContactImageLoader.Factory(context)) + registry.append(Uri::class.java, InputStream::class.java, ContactImageLoader.Factory(context)) } } \ 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 5f655d03..5d89a58d 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,8 +4,10 @@ import android.content.Context import android.net.Uri import android.provider.BaseColumns import android.provider.ContactsContract +import com.moez.QKSMS.common.util.extensions.asFlowable import com.moez.QKSMS.data.model.Contact import io.reactivex.Flowable +import io.reactivex.Single import io.realm.Realm import timber.log.Timber import javax.inject.Inject @@ -17,7 +19,16 @@ 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") + private val URI = Uri.parse("content://mms-sms/canonical-contactUri") + + fun findContactUri(address: String): Single { + return Flowable.just(address) + .map { address -> Uri.withAppendedPath(ContactsContract.PhoneLookup.CONTENT_FILTER_URI, Uri.encode(address)) } + .flatMap { uri -> context.contentResolver.query(uri, arrayOf(ContactsContract.PhoneLookup._ID), null, null, null).asFlowable() } + .firstOrError() + .map { cursor -> cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.PhoneLookup._ID)) } + .map { id -> Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_URI, id) } + } fun getContact(recipientId: Long): Flowable { return Flowable.fromPublisher { emitter -> @@ -63,7 +74,7 @@ class ContactRepository @Inject constructor(val context: Context) { fun getContactFromCache(address: String): Contact? { val realm = Realm.getDefaultInstance() val contact = realm.where(Contact::class.java) - .equalTo("address", address) + .equalTo("contactUri", address) .findFirst() realm.close() return contact diff --git a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt index 21ecb079..7b607f9b 100644 --- a/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt +++ b/qksms/src/main/java/com/moez/QKSMS/presentation/view/AvatarView.kt @@ -2,7 +2,6 @@ package com.moez.QKSMS.presentation.view import android.content.Context import android.content.res.ColorStateList -import android.telephony.PhoneNumberUtils import android.util.AttributeSet import android.view.View import android.widget.FrameLayout @@ -11,16 +10,24 @@ import com.moez.QKSMS.common.di.AppComponentManager import com.moez.QKSMS.common.util.GlideApp import com.moez.QKSMS.common.util.extensions.getColorCompat import com.moez.QKSMS.data.model.Contact +import com.moez.QKSMS.data.repository.ContactRepository +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.disposables.Disposable +import io.reactivex.schedulers.Schedulers import kotlinx.android.synthetic.main.avatar_view.view.* +import javax.inject.Inject class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) { + @Inject lateinit var contactsRepo: ContactRepository + var contact: Contact? = null set(value) { field = value updateView() } + private var loadContact: Disposable? = null constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0) constructor(context: Context) : this(context, null, 0) @@ -42,12 +49,17 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr } private fun updateView() { + loadContact?.dispose() photo.setImageDrawable(null) initial.text = "?" contact?.let { contact -> initial.text = if (contact.name.isNotEmpty()) contact.name.substring(0, 1) else "?" - GlideApp.with(photo).load(PhoneNumberUtils.stripSeparators(contact.address)).into(photo) + loadContact = contactsRepo.findContactUri(contact.address) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + { uri -> GlideApp.with(photo).load(uri).into(photo) }, { }) } } } \ No newline at end of file