Fix dialog overlap when resizing screen

linagora · Jun 4, 2024 · fa69932 · fa69932
1 parent ff1bf74
commit fa69932
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart
@@ -99,8 +99,6 @@ class ChatListController extends State<ChatList>
 
   bool isTorBrowser = false;
 
-  bool waitForFirstSync = false;
-
   bool scrolledToTop = true;
 
   Client get activeClient => matrixState.client;
@@ -419,14 +417,18 @@ class ChatListController extends State<ChatList>
 
   Future<void> _waitForFirstSyncAfterLogin() async {
     WidgetsBinding.instance.addPostFrameCallback((_) async {
-      await TomBootstrapDialog(
+      final result = await TomBootstrapDialog(
         client: activeClient,
       ).show();
+
+      if (result != null) {
+        setState(() {});
+      }
     });
 
     if (!mounted) return;
     setState(() {
-      waitForFirstSync = true;
+      matrixState.waitForFirstSync = true;
     });
   }
 
@@ -438,7 +440,7 @@ class ChatListController extends State<ChatList>
     }
     if (!mounted) return;
     setState(() {
-      waitForFirstSync = true;
+      matrixState.waitForFirstSync = true;
     });
   }
 
@@ -755,7 +757,9 @@ class ChatListController extends State<ChatList>
     }
     activeRoomIdNotifier.value = widget.activeRoomIdNotifier.value;
     scrollController.addListener(_onScroll);
-    _trySync();
+    if (!matrixState.waitForFirstSync) {
+      _trySync();
+    }
     _hackyWebRTCFixForWeb();
     // TODO: 28Dec2023 Disable callkeep for util we support audio/video calls
     // CallKeepManager().initialize();

diff --git a/lib/pages/chat_list/chat_list_body_view.dart b/lib/pages/chat_list/chat_list_body_view.dart
@@ -59,7 +59,7 @@ class ChatListBodyView extends StatelessWidget {
                   key: Key(controller.activeSpaceId ?? 'Spaces'),
                 );
               }
-              if (controller.waitForFirstSync &&
+              if (controller.matrixState.waitForFirstSync &&
                   controller.activeClient.prevBatch != null) {
                 if (controller.chatListBodyIsEmpty) {
                   return Column(

diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
@@ -86,6 +86,8 @@ class MatrixState extends State<Matrix>
   LoginType? loginType;
   bool? loginRegistrationSupported;
 
+  bool waitForFirstSync = false;
+
   bool get twakeSupported {
     final tomServerUrlInterceptor = getIt.get<DynamicUrlInterceptors>(
       instanceName: NetworkDI.tomServerUrlInterceptorName,
@@ -418,6 +420,7 @@ class MatrixState extends State<Matrix>
     Client newActiveClient,
     LoginState loginState,
   ) async {
+    waitForFirstSync = false;
     await setUpToMServicesInLogin(newActiveClient);
     await _storePersistActiveAccount(newActiveClient);
     onClientLoginStateChanged.add(
@@ -446,6 +449,7 @@ class MatrixState extends State<Matrix>
       _loginClientCandidate!.clientName,
     );
     if (activeClient == null) return;
+    waitForFirstSync = false;
     await setUpToMServicesInLogin(activeClient);
     final result = await setActiveClient(activeClient);
     if (result.isSuccess) {