From 62bf380e4068a0840e26b8133112af91e65d0865 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Fri, 9 Apr 2021 15:54:54 +0200
Subject: [PATCH] fix: Buggy routing

---
 lib/config/routes.dart | 32 +++++++-------------------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index a626caf6..d43f8227 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -61,14 +61,10 @@ class FluffyRoutes {
     }
     // Routes IF user is logged in
     else {
-      final activeRoomId = Matrix.of(context).client.activeRoomId;
       switch (parts[1]) {
         case '':
           return ViewData(
-            mainView: (_) => ChatList(),
-            emptyView: (_) =>
-                activeRoomId != null ? Chat(activeRoomId) : EmptyPage(),
-          );
+              mainView: (_) => ChatList(), emptyView: (_) => EmptyPage());
         case 'rooms':
           final roomId = parts[2];
           if (parts.length == 3) {
@@ -118,10 +114,7 @@ class FluffyRoutes {
             }
           }
           return ViewData(
-            mainView: (_) => ChatList(),
-            emptyView: (_) =>
-                activeRoomId != null ? Chat(activeRoomId) : EmptyPage(),
-          );
+              mainView: (_) => ChatList(), emptyView: (_) => EmptyPage());
         case 'archive':
           return ViewData(
             leftView: (_) => Settings(),
@@ -144,16 +137,11 @@ class FluffyRoutes {
         case 'search':
           if (parts.length == 3) {
             return ViewData(
-              mainView: (_) => SearchView(alias: parts[2]),
-              emptyView: (_) =>
-                  activeRoomId != null ? Chat(activeRoomId) : EmptyPage(),
-            );
+                mainView: (_) => SearchView(alias: parts[2]),
+                emptyView: (_) => EmptyPage());
           }
           return ViewData(
-            mainView: (_) => SearchView(),
-            emptyView: (_) =>
-                activeRoomId != null ? Chat(activeRoomId) : EmptyPage(),
-          );
+              mainView: (_) => SearchView(), emptyView: (_) => EmptyPage());
         case 'settings':
           if (parts.length == 3) {
             final action = parts[2];
@@ -196,16 +184,10 @@ class FluffyRoutes {
             }
           } else {
             return ViewData(
-              mainView: (_) => Settings(),
-              emptyView: (_) =>
-                  activeRoomId != null ? Chat(activeRoomId) : EmptyPage(),
-            );
+                mainView: (_) => Settings(), emptyView: (_) => EmptyPage());
           }
           return ViewData(
-            mainView: (_) => ChatList(),
-            emptyView: (_) =>
-                activeRoomId != null ? Chat(activeRoomId) : EmptyPage(),
-          );
+              mainView: (_) => ChatList(), emptyView: (_) => EmptyPage());
       }
     }