From 347fa01ff8eeb6048e0a26cea88c6f75ed6abf2f Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 30 Jul 2024 14:01:11 -0400 Subject: [PATCH 1/4] Chat list is shown when rooms are loaded --- lib/pages/chat_list/chat_list.dart | 3 +++ lib/pages/chat_list/chat_list_body.dart | 12 ++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 8f5515fc4..e4ac86d36 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -909,6 +909,9 @@ class ChatListController extends State Future _waitForFirstSync() async { final client = Matrix.of(context).client; await client.roomsLoading; + // #Pangea + setState(() {}); + // Pangea# await client.accountDataLoading; await client.userDeviceKeysLoading; if (client.prevBatch == null) { diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index b9b388da9..11be0e097 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -187,7 +187,12 @@ class ChatListViewBody extends StatelessWidget { ], ), ), - if (client.prevBatch == null) + // #Pangea + // Only show loading screen if room list is empty + // because it is still loading + // if (client.prevBatch == null) + if (rooms.isEmpty && client.prevBatch == null) + // Pangea# SliverList( delegate: SliverChildBuilderDelegate( (context, i) => Opacity( @@ -245,7 +250,10 @@ class ChatListViewBody extends StatelessWidget { childCount: dummyChatCount, ), ), - if (client.prevBatch != null) + // #Pangea + // if (client.prevBatch != null) + if (rooms.isNotEmpty) + // Pangea# SliverList.builder( itemCount: rooms.length, itemBuilder: (BuildContext context, int i) { From 097417188df2c4aa848440df8b55ecaa163ef483 Mon Sep 17 00:00:00 2001 From: Kelrap Date: Tue, 30 Jul 2024 14:26:26 -0400 Subject: [PATCH 2/4] Move less important syncs to own function --- lib/pages/chat_list/chat_list.dart | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index e4ac86d36..8d49c9478 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -933,8 +933,17 @@ class ChatListController extends State } // #Pangea + _lessImportantSyncs(client); + // Pangea# + if (!mounted) return; + setState(() { + waitForFirstSync = true; + }); + } + + // #Pangea + Future _lessImportantSyncs(Client client) async { if (mounted) { - // TODO try not to await so much GoogleAnalytics.analyticsUserUpdate(client.userID); await pangeaController.subscriptionController.initialize(); await pangeaController.myAnalytics.initialize(); @@ -946,14 +955,9 @@ class ChatListController extends State ErrorHandler.logError( m: "didn't run afterSyncAndFirstLoginInitialization because not mounted", ); - // debugger(when: kDebugMode); } - // Pangea# - if (!mounted) return; - setState(() { - waitForFirstSync = true; - }); } + // Pangea# void cancelAction() { if (selectMode == SelectMode.share) { From b9c9332d28fb3e3cd3502a0815d42e21883624eb Mon Sep 17 00:00:00 2001 From: Kelrap Date: Wed, 31 Jul 2024 15:12:04 -0400 Subject: [PATCH 3/4] Remove unecessary setState --- lib/pages/chat_list/chat_list.dart | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 8d49c9478..8a588d1aa 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -909,9 +909,6 @@ class ChatListController extends State Future _waitForFirstSync() async { final client = Matrix.of(context).client; await client.roomsLoading; - // #Pangea - setState(() {}); - // Pangea# await client.accountDataLoading; await client.userDeviceKeysLoading; if (client.prevBatch == null) { From 6cc07d5c3858f8768afbb1875daffb92461c889d Mon Sep 17 00:00:00 2001 From: ggurdin Date: Mon, 5 Aug 2024 09:39:04 -0400 Subject: [PATCH 4/4] changed condition to wait for next sync in stream in waitforfirstsync to better reflect whether the first sync has come through or not --- lib/pages/chat_list/chat_list.dart | 14 ++++++++------ lib/pages/chat_list/chat_list_body.dart | 12 ++---------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/lib/pages/chat_list/chat_list.dart b/lib/pages/chat_list/chat_list.dart index 8a588d1aa..ec34a5b81 100644 --- a/lib/pages/chat_list/chat_list.dart +++ b/lib/pages/chat_list/chat_list.dart @@ -911,11 +911,12 @@ class ChatListController extends State await client.roomsLoading; await client.accountDataLoading; await client.userDeviceKeysLoading; - if (client.prevBatch == null) { + // #Pangea + // See here for explanation of this change: https://github.com/pangeachat/client/pull/539 + // if (client.prevBatch == null) { + if (client.onSync.value?.nextBatch == null) { + // Pangea# await client.onSync.stream.first; - // #Pangea - pangeaController.startChatWithBotIfNotPresent(); - //Pangea# // Display first login bootstrap if enabled // #Pangea @@ -930,7 +931,7 @@ class ChatListController extends State } // #Pangea - _lessImportantSyncs(client); + await _initPangeaControllers(client); // Pangea# if (!mounted) return; setState(() { @@ -939,9 +940,10 @@ class ChatListController extends State } // #Pangea - Future _lessImportantSyncs(Client client) async { + Future _initPangeaControllers(Client client) async { if (mounted) { GoogleAnalytics.analyticsUserUpdate(client.userID); + pangeaController.startChatWithBotIfNotPresent(); await pangeaController.subscriptionController.initialize(); await pangeaController.myAnalytics.initialize(); pangeaController.afterSyncAndFirstLoginInitialization(context); diff --git a/lib/pages/chat_list/chat_list_body.dart b/lib/pages/chat_list/chat_list_body.dart index 11be0e097..b9b388da9 100644 --- a/lib/pages/chat_list/chat_list_body.dart +++ b/lib/pages/chat_list/chat_list_body.dart @@ -187,12 +187,7 @@ class ChatListViewBody extends StatelessWidget { ], ), ), - // #Pangea - // Only show loading screen if room list is empty - // because it is still loading - // if (client.prevBatch == null) - if (rooms.isEmpty && client.prevBatch == null) - // Pangea# + if (client.prevBatch == null) SliverList( delegate: SliverChildBuilderDelegate( (context, i) => Opacity( @@ -250,10 +245,7 @@ class ChatListViewBody extends StatelessWidget { childCount: dummyChatCount, ), ), - // #Pangea - // if (client.prevBatch != null) - if (rooms.isNotEmpty) - // Pangea# + if (client.prevBatch != null) SliverList.builder( itemCount: rooms.length, itemBuilder: (BuildContext context, int i) {