From 70c7f55eb5f7054403a3e0c6dcad579c722c7a75 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 2 Nov 2017 13:28:47 -0700 Subject: [PATCH] Load/cache contact photos by phone number --- .../com/moez/QKSMS/common/di/AppComponent.kt | 3 ++ .../QKSMS/common/util/ContactImageLoader.kt | 28 +++++++++++-------- .../moez/QKSMS/common/util/GlideAppModule.kt | 3 +- .../QKSMS/presentation/view/AvatarView.kt | 18 ++---------- 4 files changed, 23 insertions(+), 29 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 6a9ed2ac..8387c4bd 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,5 +1,6 @@ package com.moez.QKSMS.common.di +import com.moez.QKSMS.common.util.ContactImageLoader import com.moez.QKSMS.common.util.NotificationManager import com.moez.QKSMS.presentation.main.ConversationsAdapter import com.moez.QKSMS.presentation.main.MainActivity @@ -38,4 +39,6 @@ interface AppComponent { fun inject(viewModel: MessagesViewModel) fun inject(viewModel: SettingsViewModel) + fun inject(fetcher: ContactImageLoader.ContactImageFetcher) + } \ No newline at end of file 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 5abe9f9c..24a6dded 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 @@ -1,8 +1,8 @@ package com.moez.QKSMS.common.util import android.content.Context -import android.net.Uri import android.provider.ContactsContract +import android.telephony.PhoneNumberUtils import com.bumptech.glide.Priority import com.bumptech.glide.load.DataSource import com.bumptech.glide.load.Key @@ -11,42 +11,48 @@ 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 io.reactivex.Maybe +import com.moez.QKSMS.common.di.AppComponentManager +import com.moez.QKSMS.data.repository.ContactRepository 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: Uri?): Boolean { - return model.toString().startsWith("content://com.android.contacts/contacts/") + override fun handles(model: String?): Boolean { + return PhoneNumberUtils.isGlobalPhoneNumber(model) } - override fun buildLoadData(model: Uri, width: Int, height: Int, options: Options?): ModelLoader.LoadData { + override fun buildLoadData(model: String, 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(private val contactUri: Uri) : Key { - override fun updateDiskCacheKey(digest: MessageDigest) = digest.update(contactUri.toString().toByteArray()) + class ContactImageKey(private val address: String) : Key { + override fun updateDiskCacheKey(digest: MessageDigest) = digest.update(address.toByteArray()) } - class ContactImageFetcher(private val context: Context, private val contactUri: Uri) : DataFetcher { + class ContactImageFetcher(private val context: Context, private val address: String) : DataFetcher { + lateinit var contactRepo: ContactRepository private var loadPhotoDisposable: Disposable? = null + init { + AppComponentManager.appComponent.inject(this) + } + override fun cleanup() {} override fun getDataClass() = InputStream::class.java override fun getDataSource() = DataSource.LOCAL override fun loadData(priority: Priority?, callback: DataFetcher.DataCallback) { - loadPhotoDisposable = Maybe.just(contactUri) + loadPhotoDisposable = contactRepo.findContactUri(address) .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 ca83418c..a82c50f6 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,7 +1,6 @@ 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 @@ -18,7 +17,7 @@ class GlideAppModule : AppGlideModule() { } override fun registerComponents(context: Context, glide: Glide, registry: Registry) { - registry.append(Uri::class.java, InputStream::class.java, ContactImageLoader.Factory(context)) + registry.append(String::class.java, InputStream::class.java, ContactImageLoader.Factory(context)) } } \ No newline at end of file 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 fff45ab5..b52d1796 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,38 +2,28 @@ 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 import com.moez.QKSMS.R -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) init { - AppComponentManager.appComponent.inject(this) View.inflate(context, R.layout.avatar_view, this) } @@ -49,16 +39,12 @@ 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 "?" - loadContact = contactsRepo.findContactUri(contact.address) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe({ uri -> GlideApp.with(photo).load(uri).into(photo) }, { }) + GlideApp.with(photo).load(PhoneNumberUtils.stripSeparators(contact.address)).into(photo) } } } \ No newline at end of file