From 6866a996a37306df115f0fb8d37d0057ed60bfcc Mon Sep 17 00:00:00 2001
From: krille-chan <christian-kussowski@posteo.de>
Date: Sun, 22 Sep 2024 14:36:35 +0200
Subject: [PATCH] chore: Follow up imageviewer

---
 lib/pages/chat/events/image_bubble.dart  | 5 ++++-
 lib/pages/image_viewer/image_viewer.dart | 8 +++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/pages/chat/events/image_bubble.dart b/lib/pages/chat/events/image_bubble.dart
index 9dbdceb04..a2fcf23b3 100644
--- a/lib/pages/chat/events/image_bubble.dart
+++ b/lib/pages/chat/events/image_bubble.dart
@@ -60,7 +60,10 @@ class ImageBubble extends StatelessWidget {
     if (!tapToView) return;
     showDialog(
       context: context,
-      builder: (_) => ImageViewer(event),
+      builder: (_) => ImageViewer(
+        event,
+        outerContext: context,
+      ),
     );
   }
 
diff --git a/lib/pages/image_viewer/image_viewer.dart b/lib/pages/image_viewer/image_viewer.dart
index 94ab19dd4..9e8cfe82c 100644
--- a/lib/pages/image_viewer/image_viewer.dart
+++ b/lib/pages/image_viewer/image_viewer.dart
@@ -10,8 +10,9 @@ import '../../utils/matrix_sdk_extensions/event_extension.dart';
 
 class ImageViewer extends StatefulWidget {
   final Event event;
+  final BuildContext outerContext;
 
-  const ImageViewer(this.event, {super.key});
+  const ImageViewer(this.event, {required this.outerContext, super.key});
 
   @override
   ImageViewerController createState() => ImageViewerController();
@@ -20,8 +21,9 @@ class ImageViewer extends StatefulWidget {
 class ImageViewerController extends State<ImageViewer> {
   /// Forward this image to another room.
   void forwardAction() {
-    Matrix.of(context).shareContent = widget.event.content;
-    context.go('/rooms');
+    Matrix.of(widget.outerContext).shareContent = widget.event.content;
+    Navigator.of(context).pop();
+    widget.outerContext.go('/rooms');
   }
 
   /// Save this file with a system call.