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

Remove routes that can lead to space chats (#1757)

Browse source 
* Use push instead of go when traversing spaces
* Redirects from space chat page

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: ggurdin <46800240+ggurdin@users.noreply.github.com>
This commit is contained in:
Kelrap 2025-02-12 14:28:15 -05:00 • committed by GitHub
parent 811e732371
commit a218591805
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/pages/chat/chat.dart
View file

@ -330,6 +330,7 @@ class ChatController extends State<ChatPageWithRoom>
WidgetsBinding.instance.addObserver(this);
// #Pangea
if (!mounted) return;
if (room.isSpace) context.go("/rooms");
Future.delayed(const Duration(seconds: 1), () async {
if (!mounted) return;
debugPrint(

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

@ -480,7 +480,7 @@ class ChatListController extends State<ChatList>
? setActiveSpace(event["activeSpaceId"])
: clearActiveSpace();
if (event["activeSpaceId"] != null) {
context.go("/rooms/${event["activeSpaceId"]}/details");
context.push("/rooms/${event["activeSpaceId"]}/details");
}
}
});

10
lib/pages/invitation_selection/invitation_selection_view.dart
View file

@ -1,7 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:go_router/go_router.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/pages/invitation_selection/invitation_selection.dart';
@ -37,14 +36,7 @@ class InvitationSelectionView extends StatelessWidget {
final theme = Theme.of(context);
return Scaffold(
appBar: AppBar(
// #Pangea
// leading: const Center(child: BackButton()),
leading: Center(
child: BackButton(
onPressed: () => context.go("/rooms/${controller.roomId}/details"),
),
),
// Pangea#
leading: const Center(child: BackButton()),
titleSpacing: 0,
title: Text(L10n.of(context).inviteContact),
),

3
lib/pangea/chat_settings/pages/pangea_chat_details.dart
View file

@ -287,7 +287,8 @@ class PangeaChatDetailsView extends StatelessWidget {
Icons.person_add_outlined,
),
),
onTap: () => context.go('/rooms/${room.id}/invite'),
onTap: () =>
context.push('/rooms/${room.id}/invite'),
),
if (room.canInvite && !room.isDirectChat)
Divider(color: theme.dividerColor, height: 1),

4
lib/pangea/spaces/controllers/space_controller.dart
View file

@ -131,7 +131,7 @@ class ClassController extends BaseController {
);
if (alreadyJoined.isNotEmpty || inFoundClass) {
context.go("/rooms/${alreadyJoined.first}/details");
context.push("/rooms/${alreadyJoined.first}/details");
throw L10n.of(context).alreadyInClass;
}
@ -179,7 +179,7 @@ class ClassController extends BaseController {
await room.client.waitForRoomInSync(room.id, join: true);
}
context.go("/rooms/${room.id}/details");
context.push("/rooms/${room.id}/details");
} catch (e, s) {
ErrorHandler.logError(
e: e,