From ceb7fdb24e5a719b6ef4c1455e49bdc58178bdfc Mon Sep 17 00:00:00 2001 From: Kelrap Date: Wed, 22 May 2024 16:21:25 -0400 Subject: [PATCH] Fixed code in Fluffchat files to match convention --- lib/pages/chat_list/chat_list.dart | 2 ++ lib/pages/chat_list/chat_list_item.dart | 2 ++ lib/pages/chat_list/utils/on_chat_tap.dart | 2 ++ 3 files changed, 6 insertions(+) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 9a6345c6a..c0791c936 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -728,9 +728,11 @@ class ChatListController extends State while (selectedRoomIds.isNotEmpty) { final roomId = selectedRoomIds.first; try { + // #Pangea if (client.getRoomById(roomId)!.isUnread) { await client.getRoomById(roomId)!.markUnread(false); } + // Pangea# await client.getRoomById(roomId)!.leave(); } finally { toggleSelection(roomId); diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart index 71d5d558b..9775ec624 100644 --- a/lib/pages/chat_list/chat_list_item.dart +++ b/lib/pages/chat_list/chat_list_item.dart @@ -53,9 +53,11 @@ class ChatListItem extends StatelessWidget { message: L10n.of(context)!.archiveRoomDescription, ); if (confirmed == OkCancelResult.cancel) return; + // #Pangea if (room.isUnread) { await room.markUnread(false); } + // Pangea# await showFutureLoadingDialog( context: context, future: () => room.leave(), diff --git a/lib/pages/chat_list/utils/on_chat_tap.dart b/lib/pages/chat_list/utils/on_chat_tap.dart index 3869cd60d..d9f1c8191 100644 --- a/lib/pages/chat_list/utils/on_chat_tap.dart +++ b/lib/pages/chat_list/utils/on_chat_tap.dart @@ -45,9 +45,11 @@ void onChatTap(Room room, BuildContext context) async { return; } if (inviteAction == InviteActions.decline) { + // #Pangea if (room.isUnread) { await room.markUnread(false); } + // Pangea# await showFutureLoadingDialog( context: context, future: room.leave,