hot-fix: remove the wrong condition make the app throw at runtime

linagora · Dec 9, 2023 · 014be33 · 014be33
1 parent 80ffbb9
commit 014be33
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/lib/pages/chat/events/message/message_content_builder.dart b/lib/pages/chat/events/message/message_content_builder.dart
@@ -49,10 +49,9 @@ class MessageContentBuilder extends StatelessWidget {
           context,
           maxWidth: availableBubbleContraints.maxWidth,
           ownMessage: event.isOwnMessage,
-          hideDisplayName: nextEvent != null &&
-              event.hideDisplayName(
-                nextEvent!,
-              ),
+          hideDisplayName: event.hideDisplayName(
+            nextEvent,
+          ),
         ),
         child: Column(
           mainAxisSize: MainAxisSize.min,

diff --git a/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart b/lib/pages/chat/events/message/message_content_with_timestamp_builder.dart
@@ -115,8 +115,7 @@ class MessageContentWithTimestampBuilder extends StatelessWidget {
                             Column(
                           crossAxisAlignment: CrossAxisAlignment.start,
                           children: [
-                            nextEvent != null &&
-                                        event.hideDisplayName(nextEvent!) ||
+                            event.hideDisplayName(nextEvent) ||
                                     event.hideDisplayNameInBubbleChat
                                 ? const SizedBox()
                                 : DisplayNameWidget(

diff --git a/lib/utils/matrix_sdk_extensions/event_extension.dart b/lib/utils/matrix_sdk_extensions/event_extension.dart
@@ -153,7 +153,7 @@ extension LocalizedBody on Event {
         MessageTypes.File,
       }.contains(messageType);
 
-  bool hideDisplayName(Event nextEvent) =>
+  bool hideDisplayName(Event? nextEvent) =>
       isOwnMessage ||
       room.isDirectChat ||
       !isSameSenderWith(nextEvent) ||