From e607bc2c215467a50c4d6843c6fcc182286a6a68 Mon Sep 17 00:00:00 2001
From: Christian Pauly <christian-pauly@posteo.de>
Date: Tue, 22 Jun 2021 12:31:18 +0200
Subject: [PATCH] chore: Remove workaround of initialUrl

---
 lib/config/routes.dart | 8 +-------
 lib/main.dart          | 3 ++-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/config/routes.dart b/lib/config/routes.dart
index e9ee5db1b..54ca265e7 100644
--- a/lib/config/routes.dart
+++ b/lib/config/routes.dart
@@ -28,16 +28,10 @@ import 'package:vrouter/vrouter.dart';
 
 class AppRoutes {
   final bool columnMode;
-  final String initialUrl;
 
-  AppRoutes(this.columnMode, {this.initialUrl});
+  AppRoutes(this.columnMode);
 
   List<VRouteElement> get routes => [
-        if (initialUrl != null && initialUrl != '/')
-          VRouteRedirector(
-            path: '/',
-            redirectTo: initialUrl,
-          ),
         ..._homeRoutes,
         if (columnMode) ..._tabletRoutes,
         if (!columnMode) ..._mobileRoutes,
diff --git a/lib/main.dart b/lib/main.dart
index 315f1ddcf..a5f01ca0e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -85,6 +85,7 @@ class _FluffyChatAppState extends State<FluffyChatApp> {
           columnMode ??= newColumns > 1;
           _router ??= GlobalKey<VRouterState>();
           if (columnMode != newColumns > 1) {
+            Logs().v('Set Column Mode = $columnMode');
             WidgetsBinding.instance.addPostFrameCallback((_) {
               setState(() {
                 _initialUrl = _router.currentState.url;
@@ -104,7 +105,7 @@ class _FluffyChatAppState extends State<FluffyChatApp> {
             locale: kIsWeb
                 ? Locale(html.window.navigator.language.split('-').first)
                 : null,
-            routes: AppRoutes(columnMode, initialUrl: _initialUrl).routes,
+            routes: AppRoutes(columnMode).routes,
             builder: (context, child) {
               LoadingDialog.defaultTitle = L10n.of(context).loadingPleaseWait;
               LoadingDialog.defaultBackLabel = L10n.of(context).close;