inex
/
FurryChat
1
0
Fork 0
Code Issues Releases 2 Activity

Merge branch 'soru/unsupported-room-version' into 'master' 

handle if lastEvent is null

Closes #66

See merge request ChristianPauly/fluffychat-flutter!69
This commit is contained in:
Christian Pauly 2020-05-23 08:36:53 +00:00
parent cdcd462ea5 21a2ec5b2f
commit 150fe64352
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/components/list_items/chat_list_item.dart
View File

@ -184,16 +184,17 @@ class ChatListItem extends StatelessWidget {
softWrap: false, softWrap: false,
) )
: Text( : Text(
room.lastEvent.getLocalizedBody( room.lastEvent?.getLocalizedBody(
L10n.of(context), L10n.of(context),
withSenderNamePrefix: !room.isDirectChat, withSenderNamePrefix: !room.isDirectChat,
hideReply: true, hideReply: true,
), ) ??
'',
softWrap: false, softWrap: false,
maxLines: 1, maxLines: 1,
overflow: TextOverflow.fade, overflow: TextOverflow.fade,
style: TextStyle( style: TextStyle(
decoration: room.lastEvent.redacted decoration: room.lastEvent?.redacted == true
? TextDecoration.lineThrough ? TextDecoration.lineThrough
: null, : null,
), ),

9
lib/views/chat_list.dart
View File

@ -384,10 +384,11 @@ class _ChatListState extends State<ChatList> {
var rooms = List<Room>.from( var rooms = List<Room>.from(
Matrix.of(context).client.rooms); Matrix.of(context).client.rooms);
rooms.removeWhere((Room room) => rooms.removeWhere((Room room) =>
searchMode && room.lastEvent == null ||
!room.displayname.toLowerCase().contains( (searchMode &&
searchController.text.toLowerCase() ?? !room.displayname.toLowerCase().contains(
'')); searchController.text.toLowerCase() ??
'')));
if (rooms.isEmpty && if (rooms.isEmpty &&
(!searchMode || (!searchMode ||
publicRoomsResponse == null)) { publicRoomsResponse == null)) {