ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Mark chats as read before leaving them

Browse source
This commit is contained in:
Kelrap 2024-05-22 16:12:10 -04:00
parent 10bc0e6d72
commit f79203a47e
6 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pages/chat_list/chat_list.dart
View file

@ -728,6 +728,9 @@ class ChatListController extends State<ChatList>
while (selectedRoomIds.isNotEmpty) {
final roomId = selectedRoomIds.first;
try {
if (client.getRoomById(roomId)!.isUnread) {
await client.getRoomById(roomId)!.markUnread(false);
}
await client.getRoomById(roomId)!.leave();
} finally {
toggleSelection(roomId);

3
lib/pages/chat_list/chat_list_item.dart
View file

@ -53,6 +53,9 @@ class ChatListItem extends StatelessWidget {
message: L10n.of(context)!.archiveRoomDescription,
);
if (confirmed == OkCancelResult.cancel) return;
if (room.isUnread) {
await room.markUnread(false);
}
await showFutureLoadingDialog(
context: context,
future: () => room.leave(),

5
lib/pages/chat_list/space_view.dart
View file

@ -288,7 +288,10 @@ class _SpaceViewState extends State<SpaceView> {
// #Pangea
// future: room!.leave,
future: () async {
await room!.leave();
if (room!.isUnread) {
await room.markUnread(false);
}
await room.leave();
if (Matrix.of(context).activeRoomId == room.id) {
context.go('/rooms');
}

13
lib/pages/chat_list/utils/on_chat_tap.dart
View file

@ -1,15 +1,13 @@
import 'package:flutter/material.dart';
import 'package:adaptive_dialog/adaptive_dialog.dart';
import 'package:fluffychat/pages/chat/send_file_dialog.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/widgets/matrix.dart';
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:future_loading_dialog/future_loading_dialog.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/chat/send_file_dialog.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_locals.dart';
import 'package:fluffychat/widgets/matrix.dart';
void onChatTap(Room room, BuildContext context) async {
if (room.membership == Membership.invite) {
final inviterId =
@ -47,6 +45,9 @@ void onChatTap(Room room, BuildContext context) async {
return;
}
if (inviteAction == InviteActions.decline) {
if (room.isUnread) {
await room.markUnread(false);
}
await showFutureLoadingDialog(
context: context,
future: room.leave,

6
lib/pangea/utils/archive_space.dart
View file

@ -1,7 +1,6 @@
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pangea/extensions/pangea_room_extension.dart';
import 'package:fluffychat/pangea/utils/error_handler.dart';
import 'package:matrix/matrix.dart';
Future<void> archiveSpace(Room? space, Client client) async {
if (space == null) {
@ -14,6 +13,9 @@ Future<void> archiveSpace(Room? space, Client client) async {
final List<Room> children = await space.getChildRooms();
for (final Room child in children) {
if (child.isUnread) {
await child.markUnread(false);
}
await child.leave();
}
await space.leave();

5
lib/pangea/utils/delete_room.dart
View file

@ -1,6 +1,6 @@
import 'package:fluffychat/pangea/constants/class_default_values.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pangea/constants/class_default_values.dart';
import 'error_handler.dart';
Future<void> deleteRoom(String? roomID, Client client) async {
@ -79,6 +79,9 @@ Future<void> deleteRoom(String? roomID, Client client) async {
}
try {
if (room.isUnread) {
await room.markUnread(false);
}
await room.leave();
} catch (err) {
ErrorHandler.logError(