浏览代码

Merge pull request #1372 from nextcloud/bugfix/1371/hardenTitleCalculation

Harden Chat Title Calculation
Andy Scherzinger 3 年之前
父节点
当前提交
40d76c6436
共有 1 个文件被更改,包括 5 次插入1 次删除
  1. 5 1
      app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

+ 5 - 1
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 {
                 ""
             }