From 1b4bc6d4ab79cf9983aa2e1424f7da8d86b01d92 Mon Sep 17 00:00:00 2001 From: Moez Bhatti Date: Sun, 22 Apr 2018 19:30:50 -0400 Subject: [PATCH] Fix crash when displaying subject --- .../java/feature/compose/MessagesAdapter.kt | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/presentation/src/main/java/feature/compose/MessagesAdapter.kt b/presentation/src/main/java/feature/compose/MessagesAdapter.kt index 065c30f4..3e9a48b3 100644 --- a/presentation/src/main/java/feature/compose/MessagesAdapter.kt +++ b/presentation/src/main/java/feature/compose/MessagesAdapter.kt @@ -175,16 +175,19 @@ class MessagesAdapter @Inject constructor( view.body.text = when (message.isSms()) { true -> message.body false -> { - val subject = message.getCleansedSubject() - val sb = SpannableStringBuilder(message.parts - .mapNotNull { it.text } - .apply { subject + this } - .filter { it.isNotBlank() } - .joinToString("\n") { text -> text }) + val subject = SpannableStringBuilder(message.getCleansedSubject()) + subject.setSpan(StyleSpan(Typeface.BOLD), 0, subject.length, Spannable.SPAN_INCLUSIVE_EXCLUSIVE) - val bss = StyleSpan(Typeface.BOLD) - sb.setSpan(bss, 0, subject.length, Spannable.SPAN_INCLUSIVE_INCLUSIVE) - sb.toString() + val body = message.parts + .mapNotNull { it.text } + .filter { it.isNotBlank() } + .joinToString("\n") { text -> text } + + when { + subject.isNotBlank() && body.isNotBlank() -> subject.append("\n$body") + subject.isNotBlank() -> subject + else -> body + } } } view.body.setVisible(message.isSms() || view.body.text.isNotBlank())