From f5c536878a29815a7b7efdc470897d04aa1af49c Mon Sep 17 00:00:00 2001
From: krille-chan <krille-chan@posteo.de>
Date: Mon, 5 Feb 2024 08:50:10 +0100
Subject: [PATCH] fix: Open room after join

---
 lib/pages/chat_list/chat_list_item.dart | 70 ++++++++++++-------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/lib/pages/chat_list/chat_list_item.dart b/lib/pages/chat_list/chat_list_item.dart
index fbaa13a91..8b1cc753c 100644
--- a/lib/pages/chat_list/chat_list_item.dart
+++ b/lib/pages/chat_list/chat_list_item.dart
@@ -106,48 +106,46 @@ class ChatListItem extends StatelessWidget {
 
     if (room.membership == Membership.leave) {
       context.go('/rooms/archive/${room.id}');
+      return;
     }
 
-    if (room.membership == Membership.join) {
-      // Share content into this room
-      final shareContent = Matrix.of(context).shareContent;
-      if (shareContent != null) {
-        final shareFile = shareContent.tryGet<MatrixFile>('file');
-        if (shareContent.tryGet<String>('msgtype') ==
-                'chat.fluffy.shared_file' &&
-            shareFile != null) {
-          await showDialog(
-            context: context,
-            useRootNavigator: false,
-            builder: (c) => SendFileDialog(
-              files: [shareFile],
-              room: room,
-            ),
-          );
+    // Share content into this room
+    final shareContent = Matrix.of(context).shareContent;
+    if (shareContent != null) {
+      final shareFile = shareContent.tryGet<MatrixFile>('file');
+      if (shareContent.tryGet<String>('msgtype') == 'chat.fluffy.shared_file' &&
+          shareFile != null) {
+        await showDialog(
+          context: context,
+          useRootNavigator: false,
+          builder: (c) => SendFileDialog(
+            files: [shareFile],
+            room: room,
+          ),
+        );
+        Matrix.of(context).shareContent = null;
+      } else {
+        final consent = await showOkCancelAlertDialog(
+          context: context,
+          title: L10n.of(context)!.forward,
+          message: L10n.of(context)!.forwardMessageTo(
+            room.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)),
+          ),
+          okLabel: L10n.of(context)!.forward,
+          cancelLabel: L10n.of(context)!.cancel,
+        );
+        if (consent == OkCancelResult.cancel) {
+          Matrix.of(context).shareContent = null;
+          return;
+        }
+        if (consent == OkCancelResult.ok) {
+          room.sendEvent(shareContent);
           Matrix.of(context).shareContent = null;
-        } else {
-          final consent = await showOkCancelAlertDialog(
-            context: context,
-            title: L10n.of(context)!.forward,
-            message: L10n.of(context)!.forwardMessageTo(
-              room.getLocalizedDisplayname(MatrixLocals(L10n.of(context)!)),
-            ),
-            okLabel: L10n.of(context)!.forward,
-            cancelLabel: L10n.of(context)!.cancel,
-          );
-          if (consent == OkCancelResult.cancel) {
-            Matrix.of(context).shareContent = null;
-            return;
-          }
-          if (consent == OkCancelResult.ok) {
-            room.sendEvent(shareContent);
-            Matrix.of(context).shareContent = null;
-          }
         }
       }
-
-      context.go('/rooms/${room.id}');
     }
+
+    context.go('/rooms/${room.id}');
   }
 
   Future<void> archiveAction(BuildContext context) async {