TW-730: fix forward image not back to chat screen

linagora · Oct 5, 2023 · b52157d · b52157d
1 parent 5ef0cd5
commit b52157d
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/lib/pages/forward/forward.dart b/lib/pages/forward/forward.dart
@@ -10,7 +10,7 @@ import 'package:fluffychat/pages/chat/send_file_dialog.dart';
 import 'package:fluffychat/pages/forward/forward_view.dart';
 import 'package:fluffychat/presentation/enum/chat_list/chat_list_enum.dart';
 import 'package:fluffychat/presentation/extensions/client_extension.dart';
-import 'package:fluffychat/utils/extension/navigator_state_extension.dart';
+import 'package:fluffychat/presentation/model/pop_result_from_forward.dart';
 import 'package:flutter/material.dart';
 import 'package:go_router/go_router.dart';
 import 'package:matrix/matrix.dart';
@@ -107,7 +107,9 @@ class ForwardController extends State<Forward> {
       switch (success.runtimeType) {
         case ForwardMessageSuccess:
           final dataOnSuccess = success as ForwardMessageSuccess;
-          Navigator.of(context).popAllDialogs();
+          if (Navigator.of(context).canPop()) {
+            Navigator.of(context).pop(const PopResultFromForward());
+          }
           context.go('/rooms/${dataOnSuccess.room.id}');
           break;
         case ForwardMessageIsShareFileState:

diff --git a/lib/pages/image_viewer/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart
@@ -2,6 +2,7 @@ import 'dart:typed_data';
 
 import 'package:fluffychat/pages/forward/forward.dart';
 import 'package:fluffychat/pages/image_viewer/image_viewer_view.dart';
+import 'package:fluffychat/presentation/model/pop_result_from_forward.dart';
 import 'package:fluffychat/utils/matrix_sdk_extensions/event_extension.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
 import 'package:fluffychat/widgets/matrix.dart';
@@ -46,12 +47,15 @@ class ImageViewerController extends State<ImageViewer> {
   /// Forward this image to another room.
   void forwardAction() async {
     Matrix.of(context).shareContent = widget.event.content;
-    await showDialog(
+    final result = await showDialog(
       context: context,
       useSafeArea: false,
       useRootNavigator: false,
       builder: (c) => const Forward(),
     );
+    if (result is PopResultFromForward) {
+      Navigator.of(context).pop<PopResultFromForward>();
+    }
   }
 
   void toggleAppbarPreview() {

diff --git a/lib/presentation/model/pop_result.dart b/lib/presentation/model/pop_result.dart
@@ -0,0 +1,8 @@
+import 'package:equatable/equatable.dart';
+
+class PopResult with EquatableMixin {
+  const PopResult();
+
+  @override
+  List<Object?> get props => [];
+}
diff --git a/lib/presentation/model/pop_result_from_forward.dart b/lib/presentation/model/pop_result_from_forward.dart
@@ -0,0 +1,5 @@
+import 'package:fluffychat/presentation/model/pop_result.dart';
+
+class PopResultFromForward extends PopResult {
+  const PopResultFromForward();
+}