From cbffef5ca0d8390af13d6324a1368648a8b635e2 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Thu, 30 Aug 2018 16:43:45 -0400 Subject: [PATCH] Use SpannableString insteaed of SpannableStringBuilder when binding messages --- .../moez/QKSMS/feature/compose/MessagesAdapter.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt index 373b377b..3ce190bd 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/MessagesAdapter.kt @@ -23,7 +23,7 @@ import android.content.Context import android.graphics.Typeface import android.telephony.PhoneNumberUtils import android.text.Spannable -import android.text.SpannableStringBuilder +import android.text.SpannableString import android.text.style.StyleSpan import android.view.LayoutInflater import android.view.View @@ -231,9 +231,7 @@ class MessagesAdapter @Inject constructor( view.body.text = when (message.isSms()) { true -> message.body false -> { - val subject = SpannableStringBuilder(message.getCleansedSubject()) - subject.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE) - + val subject = message.getCleansedSubject() val body = message.parts .filter { part -> !part.isVCard() } .mapNotNull { part -> part.text } @@ -241,8 +239,11 @@ class MessagesAdapter @Inject constructor( .joinToString("\n") when { - subject.isNotBlank() && body.isNotBlank() -> subject.append("\n$body") - subject.isNotBlank() -> subject + subject.isNotBlank() -> { + val spannable = SpannableString(if (body.isNotBlank()) "$subject\n$body" else subject) + spannable.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE) + spannable + } else -> body } }