From 849bd7ca9bd25f1bc2150accc3b319e42dd6dbc7 Mon Sep 17 00:00:00 2001
From: Krille <c.kussowski@famedly.com>
Date: Mon, 8 Apr 2024 11:24:01 +0200
Subject: [PATCH] refactor: Make via fields not nullable

---
 lib/src/database/hive_database.dart | 4 ++--
 lib/src/room.dart                   | 4 ++--
 lib/src/utils/space_child.dart      | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/src/database/hive_database.dart b/lib/src/database/hive_database.dart
index b6e29dd0..f5a16bdb 100644
--- a/lib/src/database/hive_database.dart
+++ b/lib/src/database/hive_database.dart
@@ -516,8 +516,8 @@ class FamedlySdkHiveDatabase extends DatabaseApi with ZoneTransactionMixin {
   Future<List<OlmSession>> getOlmSessions(
       String identityKey, String userId) async {
     final rawSessions =
-        await _olmSessionsBox.get(identityKey.toHiveKey) as Map?;
-    if (rawSessions == null || rawSessions.isEmpty) return <OlmSession>[];
+        await _olmSessionsBox.get(identityKey.toHiveKey) as Map? ?? {};
+
     return rawSessions.values
         .map((json) => OlmSession.fromJson(convertToJson(json), userId))
         .toList();
diff --git a/lib/src/room.dart b/lib/src/room.dart
index 0b7f9950..a9e3f070 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -2233,7 +2233,7 @@ class Room {
       states[EventTypes.spaceParent]
           ?.values
           .map((state) => SpaceParent.fromState(state))
-          .where((child) => child.via?.isNotEmpty ?? false)
+          .where((child) => child.via.isNotEmpty)
           .toList() ??
       [];
 
@@ -2246,7 +2246,7 @@ class Room {
       : (states[EventTypes.spaceChild]
               ?.values
               .map((state) => SpaceChild.fromState(state))
-              .where((child) => child.via?.isNotEmpty ?? false)
+              .where((child) => child.via.isNotEmpty)
               .toList() ??
           [])
     ..sort((a, b) => a.order.isEmpty || b.order.isEmpty
diff --git a/lib/src/utils/space_child.dart b/lib/src/utils/space_child.dart
index ec5acb41..08c39fb1 100644
--- a/lib/src/utils/space_child.dart
+++ b/lib/src/utils/space_child.dart
@@ -21,26 +21,26 @@ import 'package:matrix/src/event.dart';
 
 class SpaceChild {
   final String? roomId;
-  final List<String>? via;
+  final List<String> via;
   final String order;
   final bool? suggested;
 
   SpaceChild.fromState(Event state)
       : assert(state.type == EventTypes.spaceChild),
         roomId = state.stateKey,
-        via = state.content.tryGetList<String>('via'),
+        via = state.content.tryGetList<String>('via') ?? [],
         order = state.content.tryGet<String>('order') ?? '',
         suggested = state.content.tryGet<bool>('suggested');
 }
 
 class SpaceParent {
   final String? roomId;
-  final List<String>? via;
+  final List<String> via;
   final bool? canonical;
 
   SpaceParent.fromState(Event state)
       : assert(state.type == EventTypes.spaceParent),
         roomId = state.stateKey,
-        via = state.content.tryGetList<String>('via'),
+        via = state.content.tryGetList<String>('via') ?? [],
         canonical = state.content.tryGet<bool>('canonical');
 }