Browse Source

Fix #692

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 years ago
parent
commit
0451131fa4

+ 4 - 3
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

@@ -651,10 +651,11 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
     }
 
     override fun getTitle(): String? {
-        if (currentConversation != null && currentConversation?.displayName != null) {
-            return EmojiCompat.get().process(currentConversation!!.displayName).toString()
+        val charSequence = currentConversation?.displayName as CharSequence
+        return if (charSequence != null) {
+            EmojiCompat.get().process(charSequence).toString()
         } else {
-            return ""
+            ""
         }
     }