fixup! fixup! fixup! fixup! fixup! TW-1936: change from go to push wh…

…en open sharing screen
linagora · Sep 9, 2024 · eaf9e2f · eaf9e2f
1 parent 4879dec
commit eaf9e2f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/lib/config/go_routes/go_router.dart b/lib/config/go_routes/go_router.dart
@@ -17,7 +17,6 @@ import 'package:fluffychat/pages/login/on_auth_redirect.dart';
 import 'package:fluffychat/pages/new_group/new_group_chat_info.dart';
 import 'package:fluffychat/pages/settings_dashboard/settings_app_language/settings_app_language.dart';
 import 'package:fluffychat/pages/settings_dashboard/settings_profile/settings_profile.dart';
-import 'package:fluffychat/pages/share/share.dart';
 import 'package:fluffychat/pages/story/story_page.dart';
 import 'package:fluffychat/pages/twake_welcome/twake_welcome.dart';
 import 'package:fluffychat/presentation/model/chat/chat_router_input_argument.dart';
@@ -519,14 +518,6 @@ abstract class AppRoutes {
             ),
           ],
         ),
-        GoRoute(
-          path: '/share',
-          pageBuilder: (context, state) => defaultPageBuilder(
-            context,
-            const Share(),
-          ),
-          redirect: loggedOutRedirect,
-        ),
       ],
     ),
   ];

diff --git a/lib/pages/chat_list/receive_sharing_intent_mixin.dart b/lib/pages/chat_list/receive_sharing_intent_mixin.dart
@@ -40,17 +40,28 @@ mixin ReceiveSharingIntentMixin<T extends StatefulWidget> on State<T> {
   }
 
   void openSharePage() {
-    if (TwakeApp.router.routeInformationProvider.value.uri.path
-        .startsWith('/rooms/')) {
+    if (isCurrentPageIsNotRooms()) {
+      return;
+    }
+    if (isCurrentPageIsInRooms()) {
       TwakeApp.router.go('/rooms');
     }
+
     Navigator.of(TwakeApp.routerKey.currentContext!).push(
       MaterialPageRoute(
         builder: (context) => const Share(),
       ),
     );
   }
 
+  bool isCurrentPageIsInRooms() =>
+      TwakeApp.router.routeInformationProvider.value.uri.path
+          .startsWith('/rooms/');
+
+  bool isCurrentPageIsNotRooms() =>
+      !TwakeApp.router.routeInformationProvider.value.uri.path
+          .startsWith('/rooms');
+
   void _processIncomingSharedText(String? text) {
     if (text == null) return;
     if (_intentOpenApp(text)) {