From b95bb003df005e99b64b8eb63e276b84a755b5cf Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Fri, 27 Sep 2019 13:52:31 +0200
Subject: [PATCH] Fix notifications crash

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/build.gradle                                            | 4 ++--
 .../java/com/nextcloud/talk/controllers/ChatController.kt   | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 924b9e142..74dd1c913 100644
--- a/app/build.gradle
+++ b/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
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 cb210bda8..87ebdd922 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
+++ b/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() {