OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'braid/null-safe-code' into 'main' 

fix: make some Room getters null safe

See merge request famedly/company/frontend/famedlysdk!1196
This commit is contained in:
Nicolas Werner 2022-12-14 22:36:29 +00:00
parent 6a1ebf5b24 35a108b704
commit 58b3098f16
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/src/room.dart
View File

@ -287,7 +287,9 @@ class Room {
} }
} }
if (membership == Membership.invite) { 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 ?.senderFromMemoryOrFallback
.avatarUrl; .avatarUrl;
} }
@ -316,7 +318,9 @@ class Room {
/// Returns null otherwise. /// Returns null otherwise.
String? get directChatMatrixID { String? get directChatMatrixID {
if (membership == Membership.invite) { 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) { if (invitation != null && invitation.content['is_direct'] == true) {
return invitation.senderId; return invitation.senderId;
} }