From 3514d6b3fcad67db3ffd1da1ca56656847350225 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 29 Jun 2021 12:56:42 +0200 Subject: [PATCH] Catch IllegalStateException in case EmojiCompat hasn't been initialized yet Fixes #1371 Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/talk/controllers/ChatController.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt index 44484197d..ea6cea1af 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -1270,7 +1270,11 @@ class ChatController(args: Bundle) : override val title: String get() = if (currentConversation?.displayName != null) { - " " + EmojiCompat.get().process(currentConversation?.displayName as CharSequence).toString() + try { + " " + EmojiCompat.get().process(currentConversation?.displayName as CharSequence).toString() + } catch (e: IllegalStateException) { + " " + currentConversation?.displayName + } } else { "" }