talksik/stream-chat-flutter
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #635 from GetStream/fix/null-checks-on-message-text

Browse Source 
fix(ui): add null checks on message text
This commit is contained in:
Salvatore Giordano
2021-08-23 10:11:13 +02:00
committed by GitHub
parent 3db81213f0 501208a9e4
commit f87a733929
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/stream_chat_flutter/CHANGELOG.md
+1
View File
@@ -52,6 +52,7 @@ breakdown:
camera is null. camera is null.
- Fixed date dividers position/alignment in non reversed `MessageListView`. - Fixed date dividers position/alignment in non reversed `MessageListView`.
- Fixed `MessageListView` not opening to the right initialMessage if `StreamChannel.initialMessageId` is set. - Fixed `MessageListView` not opening to the right initialMessage if `StreamChannel.initialMessageId` is set.
- Fixed null check errors when accessing `message.text` in `MessageWidget` and `MessageListView`; this occurred when sending a message with no text.
## 2.1.2 ## 2.1.2
packages/stream_chat_flutter/lib/src/message_list_view.dart
+2 -2
View File
@@ -849,7 +849,7 @@ class _MessageListViewState extends State<MessageListView> {
) { ) {
final isMyMessage = final isMyMessage =
message.user!.id == StreamChat.of(context).currentUser!.id; message.user!.id == StreamChat.of(context).currentUser!.id;
final isOnlyEmoji = message.text!.isOnlyEmoji; final isOnlyEmoji = message.text?.isOnlyEmoji ?? false;
final currentUser = StreamChat.of(context).currentUser; final currentUser = StreamChat.of(context).currentUser;
final members = StreamChannel.of(context).channel.state?.members ?? []; final members = StreamChannel.of(context).channel.state?.members ?? [];
final currentUserMember = final currentUserMember =
@@ -988,7 +988,7 @@ class _MessageListViewState extends State<MessageListView> {
final showInChannelIndicator = !_isThreadConversation && isThreadMessage; final showInChannelIndicator = !_isThreadConversation && isThreadMessage;
final showThreadReplyIndicator = !_isThreadConversation && hasReplies; final showThreadReplyIndicator = !_isThreadConversation && hasReplies;
final isOnlyEmoji = message.text!.isOnlyEmoji; final isOnlyEmoji = message.text?.isOnlyEmoji ?? false;
final hasUrlAttachment = final hasUrlAttachment =
message.attachments.any((it) => it.ogScrapeUrl != null) == true; message.attachments.any((it) => it.ogScrapeUrl != null) == true;
packages/stream_chat_flutter/lib/src/message_widget.dart
+3 -3
View File
@@ -1048,7 +1048,7 @@ class _MessageWidgetState extends State<MessageWidget>
messageWidget: widget.copyWith( messageWidget: widget.copyWith(
key: const Key('MessageWidget'), key: const Key('MessageWidget'),
message: widget.message.copyWith( message: widget.message.copyWith(
text: widget.message.text!.length > 200 text: (widget.message.text?.length ?? 0) > 200
? '${widget.message.text!.substring(0, 200)}...' ? '${widget.message.text!.substring(0, 200)}...'
: widget.message.text, : widget.message.text,
), ),
@@ -1111,7 +1111,7 @@ class _MessageWidgetState extends State<MessageWidget>
messageWidget: widget.copyWith( messageWidget: widget.copyWith(
key: const Key('MessageWidget'), key: const Key('MessageWidget'),
message: widget.message.copyWith( message: widget.message.copyWith(
text: widget.message.text!.length > 200 text: (widget.message.text?.length ?? 0) > 200
? '${widget.message.text!.substring(0, 200)}...' ? '${widget.message.text!.substring(0, 200)}...'
: widget.message.text, : widget.message.text,
), ),
@@ -1258,7 +1258,7 @@ class _MessageWidgetState extends State<MessageWidget>
); );
Widget _buildTextBubble() { Widget _buildTextBubble() {
if (widget.message.text!.trim().isEmpty) return const Offstage(); if (widget.message.text?.trim().isEmpty ?? false) return const Offstage();
return Column( return Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [