From 9666b763a5e39629f9cb68ac75cf74d2c87dea5c Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Wed, 3 Jul 2019 11:19:45 +0200
Subject: [PATCH] Fix Event decode bug

---
 lib/src/Event.dart | 5 ++---
 lib/src/Store.dart | 4 +---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/lib/src/Event.dart b/lib/src/Event.dart
index 51ed072..5067afb 100644
--- a/lib/src/Event.dart
+++ b/lib/src/Event.dart
@@ -130,12 +130,11 @@ class Event {
   static Event fromJson(Map<String, dynamic> jsonObj, Room room) {
     Map<String, dynamic> content = jsonObj["content"];
 
-    if (content == null)
+    if (content == null && jsonObj["content_json"] != null)
       try {
         content = json.decode(jsonObj["content_json"]);
       } catch (e) {
-        print(
-            "jsonObj decode of event content '$jsonObj' failed: ${e.toString()}");
+        print("jsonObj decode of event content failed: ${e.toString()}");
         content = {};
       }
 
diff --git a/lib/src/Store.dart b/lib/src/Store.dart
index bd42542..7e6b9c6 100644
--- a/lib/src/Store.dart
+++ b/lib/src/Store.dart
@@ -474,10 +474,8 @@ class Store {
 
     List<Event> eventList = [];
 
-    for (num i = 0; i < eventRes.length; i++) {
-      print("Try to parse Event $i of ${eventRes.length}: ${eventRes[i]}");
+    for (num i = 0; i < eventRes.length; i++)
       eventList.add(Event.fromJson(eventRes[i], room));
-    }
 
     return eventList;
   }