From 36070e23b766a4d6c85d9ecc890685e57a80e62b Mon Sep 17 00:00:00 2001
From: td <j.nirve@famedly.com>
Date: Fri, 5 May 2023 19:31:08 +0530
Subject: [PATCH] fix: cast issues in getEventList

---
 lib/src/database/hive_collections_database.dart |  9 ++++-----
 lib/src/database/hive_database.dart             | 12 ++++++++----
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart
index 1234c5c1..b3dd839c 100644
--- a/lib/src/database/hive_collections_database.dart
+++ b/lib/src/database/hive_collections_database.dart
@@ -402,13 +402,12 @@ class HiveCollectionsDatabase extends DatabaseApi {
         // Combine those two lists while respecting the start and limit parameters.
         final end = min(timelineEventIds.length,
             start + (limit ?? timelineEventIds.length));
-        final eventIds = <String>[
+        final eventIds = List<String>.from([
           ...sendingEventIds,
           ...(start < timelineEventIds.length && !onlySending
-                  ? timelineEventIds.getRange(start, end).toList()
-                  : [])
-              .whereType<String>()
-        ];
+              ? timelineEventIds.getRange(start, end).toList()
+              : [])
+        ]);
 
         return await _getEventsByIds(eventIds, room);
       });
diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index 05bcaf9c..6135700a 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -408,12 +408,16 @@ class FamedlySdkHiveDatabase extends DatabaseApi {
         // Combine those two lists while respecting the start and limit parameters.
         final end = min(timelineEventIds.length,
             start + (limit ?? timelineEventIds.length));
-        final eventIds = sendingEventIds +
-            (start < timelineEventIds.length && !onlySending
+        final eventIds = List<String>.from(
+          [
+            ...sendingEventIds,
+            ...(start < timelineEventIds.length && !onlySending
                 ? timelineEventIds.getRange(start, end).toList()
-                : []);
+                : [])
+          ],
+        );
 
-        return await _getEventsByIds(eventIds.cast<String>(), room);
+        return await _getEventsByIds(eventIds, room);
       });
 
   @override