浏览代码

Fix notifications crash

Signed-off-by: Mario Danic <mario@lovelyhq.com>
Mario Danic 5 年之前
父节点
当前提交
b95bb003df
共有 2 个文件被更改,包括 7 次插入3 次删除
  1. 2 2
      app/build.gradle
  2. 5 1
      app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

+ 2 - 2
app/build.gradle

@@ -38,8 +38,8 @@ android {
         targetSdkVersion 28
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
-        versionCode 115
-        versionName "7.0.1"
+        versionCode 116
+        versionName "7.0.2"
 
         flavorDimensions "default"
         renderscriptTargetApi 19

+ 5 - 1
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt

@@ -616,7 +616,11 @@ class ChatController(args: Bundle) : BaseController(args), MessagesListAdapter
     }
 
     override fun getTitle(): String? {
-        return EmojiCompat.get().process(currentConversation!!.displayName).toString()
+        if (currentConversation != null) {
+            return EmojiCompat.get().process(currentConversation!!.displayName).toString()
+        } else {
+            return ""
+        }
     }
 
     public override fun onDestroy() {