From 1e2ae2c8b037b2a18e398ee30af77fddee2c3272 Mon Sep 17 00:00:00 2001 From: Mario Danic Date: Wed, 15 Jan 2020 13:48:04 +0100 Subject: [PATCH] Fix #704 Signed-off-by: Mario Danic --- app/build.gradle | 4 ++-- .../com/nextcloud/talk/controllers/ChatController.kt | 9 ++++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1c72c4d28..b34b5d26e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,8 +39,8 @@ android { targetSdkVersion 29 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - versionCode 124 - versionName "8.0.0beta2" + versionCode 125 + versionName "8.0.0beta3" flavorDimensions "default" renderscriptTargetApi 19 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 01a474838..99419b3ad 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt @@ -651,12 +651,11 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter } override fun getTitle(): String? { - val charSequence = currentConversation?.displayName as CharSequence - return if (charSequence != null) { - EmojiCompat.get().process(charSequence).toString() - } else { - "" + currentConversation?.displayName?.let { + return EmojiCompat.get().process(it as CharSequence).toString() } + + return "" } public override fun onDestroy() {