From 3279d64b43c7a63adda255e32118ff2aed4b84bd Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Tue, 13 Mar 2018 20:13:27 -0700 Subject: [PATCH] Format phone number when displaying conversation title --- qksms/src/main/java/data/model/Conversation.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/qksms/src/main/java/data/model/Conversation.kt b/qksms/src/main/java/data/model/Conversation.kt index 8084cad1..fa4e9227 100644 --- a/qksms/src/main/java/data/model/Conversation.kt +++ b/qksms/src/main/java/data/model/Conversation.kt @@ -18,10 +18,12 @@ */ package data.model +import android.telephony.PhoneNumberUtils import io.realm.RealmList import io.realm.RealmObject import io.realm.annotations.Index import io.realm.annotations.PrimaryKey +import java.util.* open class Conversation : RealmObject() { @@ -34,8 +36,8 @@ open class Conversation : RealmObject() { fun getTitle(): String { var title = "" recipients.forEachIndexed { index, recipient -> - val name = recipient.contact?.name - title += if (name.isNullOrBlank()) recipient.address else name + val name = recipient.contact?.name?.takeIf { it.isNotBlank() } + title += name ?: PhoneNumberUtils.formatNumber(recipient.address, Locale.getDefault().country) if (index < recipients.size - 1) { title += ", " }