From 35a108b70468ff82c76877c5c6cfdbe79b825fee Mon Sep 17 00:00:00 2001 From: TheOneWithTheBraid Date: Wed, 14 Dec 2022 21:15:18 +0100 Subject: [PATCH] fix: make some Room getters null safe - gixes huge error cause in integration tests of related apps Signed-off-by: TheOneWithTheBraid --- lib/src/room.dart | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/src/room.dart b/lib/src/room.dart index 06255c12..09c3ccbe 100644 --- a/lib/src/room.dart +++ b/lib/src/room.dart @@ -272,7 +272,9 @@ class Room { } } if (membership == Membership.invite) { - return getState(EventTypes.RoomMember, client.userID!) + final userID = client.userID; + if (userID == null) return null; + return getState(EventTypes.RoomMember, userID) ?.senderFromMemoryOrFallback .avatarUrl; } @@ -301,7 +303,9 @@ class Room { /// Returns null otherwise. String? get directChatMatrixID { if (membership == Membership.invite) { - final invitation = getState(EventTypes.RoomMember, client.userID!); + final userID = client.userID; + if (userID == null) return null; + final invitation = getState(EventTypes.RoomMember, userID); if (invitation != null && invitation.content['is_direct'] == true) { return invitation.senderId; }