From 1ec08f052cb387ac2386e5c80fc794887bb56ed8 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 31 Oct 2017 21:34:55 -0700 Subject: [PATCH] Format phone number before lookup --- .../java/com/moez/QKSMS/common/util/ContactImageLoader.kt | 8 ++++---- .../java/com/moez/QKSMS/presentation/view/AvatarView.kt | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) 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 b6527e4a..e654a946 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 @@ -28,7 +28,7 @@ class ContactImageLoader(val context: Context) : ModelLoader { - return ModelLoader.LoadData(ContactImageKey(model), ContactImageFetcher(context, model)) + return ModelLoader.LoadData(ContactImageKey(model.orEmpty()), ContactImageFetcher(context, model.orEmpty())) } class Factory(val context: Context) : ModelLoaderFactory { @@ -36,11 +36,11 @@ class ContactImageLoader(val context: Context) : ModelLoader { + class ContactImageFetcher(val context: Context, val address: String) : DataFetcher { private var loadPhotoDisposable: Disposable? = null 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 f2a771f3..21ecb079 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,6 +2,7 @@ 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 @@ -46,7 +47,7 @@ class AvatarView(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : Fr contact?.let { contact -> initial.text = if (contact.name.isNotEmpty()) contact.name.substring(0, 1) else "?" - GlideApp.with(photo).load(contact.address).into(photo) + GlideApp.with(photo).load(PhoneNumberUtils.stripSeparators(contact.address)).into(photo) } } } \ No newline at end of file