mirror of
https://github.com/quik-sms/quik.git
synced 2026-11-22 13:48:52 +01:00
Use Uri to load Contact photos in AvatarView
This commit is contained in:
@@ -1,8 +1,8 @@
|
|||||||
package com.moez.QKSMS.common.di
|
package com.moez.QKSMS.common.di
|
||||||
|
|
||||||
import com.moez.QKSMS.common.util.NotificationManager
|
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.ConversationsAdapter
|
||||||
|
import com.moez.QKSMS.presentation.main.MainActivity
|
||||||
import com.moez.QKSMS.presentation.main.MainViewModel
|
import com.moez.QKSMS.presentation.main.MainViewModel
|
||||||
import com.moez.QKSMS.presentation.messages.MessagesActivity
|
import com.moez.QKSMS.presentation.messages.MessagesActivity
|
||||||
import com.moez.QKSMS.presentation.messages.MessagesAdapter
|
import com.moez.QKSMS.presentation.messages.MessagesAdapter
|
||||||
|
|||||||
@@ -3,8 +3,6 @@ package com.moez.QKSMS.common.util
|
|||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.ContactsContract
|
import android.provider.ContactsContract
|
||||||
import android.provider.ContactsContract.PhoneLookup
|
|
||||||
import android.telephony.PhoneNumberUtils
|
|
||||||
import com.bumptech.glide.Priority
|
import com.bumptech.glide.Priority
|
||||||
import com.bumptech.glide.load.DataSource
|
import com.bumptech.glide.load.DataSource
|
||||||
import com.bumptech.glide.load.Key
|
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.ModelLoader
|
||||||
import com.bumptech.glide.load.model.ModelLoaderFactory
|
import com.bumptech.glide.load.model.ModelLoaderFactory
|
||||||
import com.bumptech.glide.load.model.MultiModelLoaderFactory
|
import com.bumptech.glide.load.model.MultiModelLoaderFactory
|
||||||
import com.moez.QKSMS.common.util.extensions.asFlowable
|
import io.reactivex.Maybe
|
||||||
import io.reactivex.Flowable
|
|
||||||
import io.reactivex.disposables.Disposable
|
import io.reactivex.disposables.Disposable
|
||||||
import io.reactivex.schedulers.Schedulers
|
import io.reactivex.schedulers.Schedulers
|
||||||
import java.io.InputStream
|
import java.io.InputStream
|
||||||
import java.security.MessageDigest
|
import java.security.MessageDigest
|
||||||
|
|
||||||
|
|
||||||
class ContactImageLoader(val context: Context) : ModelLoader<String, InputStream> {
|
class ContactImageLoader(val context: Context) : ModelLoader<Uri, InputStream> {
|
||||||
|
|
||||||
override fun handles(model: String?): Boolean {
|
override fun handles(model: Uri?): Boolean {
|
||||||
return PhoneNumberUtils.isGlobalPhoneNumber(model)
|
return model.toString().startsWith("content://com.android.contacts/contacts/")
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun buildLoadData(model: String?, width: Int, height: Int, options: Options?): ModelLoader.LoadData<InputStream> {
|
override fun buildLoadData(model: Uri, width: Int, height: Int, options: Options?): ModelLoader.LoadData<InputStream> {
|
||||||
return ModelLoader.LoadData(ContactImageKey(model.orEmpty()), ContactImageFetcher(context, model.orEmpty()))
|
return ModelLoader.LoadData(ContactImageKey(model), ContactImageFetcher(context, model))
|
||||||
}
|
}
|
||||||
|
|
||||||
class Factory(val context: Context) : ModelLoaderFactory<String, InputStream> {
|
class Factory(val context: Context) : ModelLoaderFactory<Uri, InputStream> {
|
||||||
override fun build(multiFactory: MultiModelLoaderFactory) = ContactImageLoader(context)
|
override fun build(multiFactory: MultiModelLoaderFactory) = ContactImageLoader(context)
|
||||||
override fun teardown() {} // nothing to do here
|
override fun teardown() {} // nothing to do here
|
||||||
}
|
}
|
||||||
|
|
||||||
class ContactImageKey(val address: String) : Key {
|
class ContactImageKey(private val contactUri: Uri) : Key {
|
||||||
override fun updateDiskCacheKey(digest: MessageDigest) = digest.update(address.toByteArray())
|
override fun updateDiskCacheKey(digest: MessageDigest) = digest.update(contactUri.toString().toByteArray())
|
||||||
}
|
}
|
||||||
|
|
||||||
class ContactImageFetcher(val context: Context, val address: String) : DataFetcher<InputStream> {
|
class ContactImageFetcher(private val context: Context, private val contactUri: Uri) : DataFetcher<InputStream> {
|
||||||
|
|
||||||
private var loadPhotoDisposable: Disposable? = null
|
private var loadPhotoDisposable: Disposable? = null
|
||||||
|
|
||||||
@@ -49,12 +46,7 @@ class ContactImageLoader(val context: Context) : ModelLoader<String, InputStream
|
|||||||
override fun getDataSource() = DataSource.LOCAL
|
override fun getDataSource() = DataSource.LOCAL
|
||||||
|
|
||||||
override fun loadData(priority: Priority?, callback: DataFetcher.DataCallback<in InputStream>) {
|
override fun loadData(priority: Priority?, callback: DataFetcher.DataCallback<in InputStream>) {
|
||||||
loadPhotoDisposable = Flowable.just(address)
|
loadPhotoDisposable = Maybe.just(contactUri)
|
||||||
.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) }
|
|
||||||
.map { uri -> ContactsContract.Contacts.openContactPhotoInputStream(context.contentResolver, uri) }
|
.map { uri -> ContactsContract.Contacts.openContactPhotoInputStream(context.contentResolver, uri) }
|
||||||
.subscribeOn(Schedulers.io())
|
.subscribeOn(Schedulers.io())
|
||||||
.subscribe(
|
.subscribe(
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.moez.QKSMS.common.util
|
package com.moez.QKSMS.common.util
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.net.Uri
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import com.bumptech.glide.Glide
|
import com.bumptech.glide.Glide
|
||||||
import com.bumptech.glide.GlideBuilder
|
import com.bumptech.glide.GlideBuilder
|
||||||
@@ -17,7 +18,7 @@ class GlideAppModule : AppGlideModule() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
|
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))
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -4,8 +4,10 @@ import android.content.Context
|
|||||||
import android.net.Uri
|
import android.net.Uri
|
||||||
import android.provider.BaseColumns
|
import android.provider.BaseColumns
|
||||||
import android.provider.ContactsContract
|
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.Contact
|
||||||
import io.reactivex.Flowable
|
import io.reactivex.Flowable
|
||||||
|
import io.reactivex.Single
|
||||||
import io.realm.Realm
|
import io.realm.Realm
|
||||||
import timber.log.Timber
|
import timber.log.Timber
|
||||||
import javax.inject.Inject
|
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)
|
* 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<Uri> {
|
||||||
|
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<Contact> {
|
fun getContact(recipientId: Long): Flowable<Contact> {
|
||||||
return Flowable.fromPublisher<Contact> { emitter ->
|
return Flowable.fromPublisher<Contact> { emitter ->
|
||||||
@@ -63,7 +74,7 @@ class ContactRepository @Inject constructor(val context: Context) {
|
|||||||
fun getContactFromCache(address: String): Contact? {
|
fun getContactFromCache(address: String): Contact? {
|
||||||
val realm = Realm.getDefaultInstance()
|
val realm = Realm.getDefaultInstance()
|
||||||
val contact = realm.where(Contact::class.java)
|
val contact = realm.where(Contact::class.java)
|
||||||
.equalTo("address", address)
|
.equalTo("contactUri", address)
|
||||||
.findFirst()
|
.findFirst()
|
||||||
realm.close()
|
realm.close()
|
||||||
return contact
|
return contact
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package com.moez.QKSMS.presentation.view
|
|||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.content.res.ColorStateList
|
import android.content.res.ColorStateList
|
||||||
import android.telephony.PhoneNumberUtils
|
|
||||||
import android.util.AttributeSet
|
import android.util.AttributeSet
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.FrameLayout
|
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.GlideApp
|
||||||
import com.moez.QKSMS.common.util.extensions.getColorCompat
|
import com.moez.QKSMS.common.util.extensions.getColorCompat
|
||||||
import com.moez.QKSMS.data.model.Contact
|
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 kotlinx.android.synthetic.main.avatar_view.view.*
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) {
|
class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : FrameLayout(context, attrs, defStyleAttr) {
|
||||||
|
|
||||||
|
@Inject lateinit var contactsRepo: ContactRepository
|
||||||
|
|
||||||
var contact: Contact? = null
|
var contact: Contact? = null
|
||||||
set(value) {
|
set(value) {
|
||||||
field = value
|
field = value
|
||||||
updateView()
|
updateView()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private var loadContact: Disposable? = null
|
||||||
|
|
||||||
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
|
constructor(context: Context, attrs: AttributeSet?) : this(context, attrs, 0)
|
||||||
constructor(context: Context) : this(context, null, 0)
|
constructor(context: Context) : this(context, null, 0)
|
||||||
@@ -42,12 +49,17 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun updateView() {
|
private fun updateView() {
|
||||||
|
loadContact?.dispose()
|
||||||
photo.setImageDrawable(null)
|
photo.setImageDrawable(null)
|
||||||
initial.text = "?"
|
initial.text = "?"
|
||||||
|
|
||||||
contact?.let { contact ->
|
contact?.let { contact ->
|
||||||
initial.text = if (contact.name.isNotEmpty()) contact.name.substring(0, 1) else "?"
|
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) }, { })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user