From c4c1c676da429cb23a032deb8ec5d7a13f0c5871 Mon Sep 17 00:00:00 2001
From: Jayesh Nirve <nirvejayesh@gmail.com>
Date: Tue, 17 Aug 2021 05:12:17 +0530
Subject: [PATCH] fix null check

---
 lib/src/database/hive_database.dart | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index 362a810e..b381e128 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -860,18 +860,20 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
         final eventsInRoomStateBox = states?.values
             ?.map((raw) => Event.fromJson(convertToJson(raw), room))
             ?.toList();
-
-        for (final event in eventsInRoomStateBox) {
-          if (event.type == 'm.room.message') {
-            stateMap.values.first['content']['m.relates_to'] == null
-                ? await _roomStateBox.put(key, stateMap)
-                : {event.eventId, event.relationshipEventId}.contains(stateMap
-                        .values.first['content']['m.relates_to']['event_id'])
-                    ? await _roomStateBox.put(key, stateMap)
-                    : null;
-          } else {
-            await _roomStateBox.put(key, stateMap);
+        if (eventsInRoomStateBox != null) {
+          for (final event in eventsInRoomStateBox) {
+            if (event.type == 'm.room.message') {
+              stateMap.values.first['content']['m.relates_to'] == null
+                  ? await _roomStateBox.put(key, stateMap)
+                  : {event.eventId, event.relationshipEventId}.contains(stateMap
+                          .values.first['content']['m.relates_to']['event_id'])
+                      ? await _roomStateBox.put(key, stateMap)
+                      : null;
+            } else {
+              await _roomStateBox.put(key, stateMap);
+            }
           }
+          await _roomStateBox.put(key, stateMap);
         }
       }
     }