From 68ed05ae7fbb72a363a16c8c0e66ec6a4e491407 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Wed, 30 Sep 2020 10:41:15 +0200 Subject: [PATCH] Don't crash on empty message If the message is empty, m.last() causes a NoSuchElementException. Fixes https://github.com/SpiritCroc/SchildiChat-android/issues/17 Change-Id: I31ad5a8e4f8baf5d095cf34f430c5337737442b4 --- .../features/home/room/detail/timeline/item/MessageTextItem.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt index 2f5b2eb107..ffe15e2745 100644 --- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt +++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/MessageTextItem.kt @@ -54,7 +54,7 @@ abstract class MessageTextItem : AbsMessageItem() { message?.findPillsAndProcess(coroutineScope) { it.bind(holder.messageView) } } var m = message - if (m != null) { + if (m != null && m.isNotEmpty()) { // Remove last trailing newline: looks especially bad in message bubble if (m.last() == '\n') { m = m.subSequence(0, m.length-1)