From 6b91079c49d1891e8a5b35a27313107f3f6d5fcc Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Wed, 8 Aug 2018 22:44:45 +0200
Subject: [PATCH] Fix a crashing bug

Signed-off-by: Mario Danic <mario@lovelyhq.com>
---
 app/build.gradle                                              | 4 ++--
 .../json/converters/EnumSystemMessageTypeConverter.java       | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 25dd4779f..4bda40820 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,8 +15,8 @@ android {
         targetSdkVersion 27
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
-        versionCode 53
-        versionName "3.0.0beta2"
+        versionCode 54
+        versionName "3.0.0beta3"
 
         flavorDimensions "default"
         renderscriptTargetApi 19
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java
index 110484642..ca4f506af 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.java
@@ -80,6 +80,10 @@ public class EnumSystemMessageTypeConverter extends StringBasedTypeConverter<Cha
     @Override
     public String convertToString(ChatMessage.SystemMessageType object) {
 
+        if (object == null) {
+            return "";
+        }
+
         switch (object) {
             case CONVERSATION_CREATED:
                 return "conversation_created";