Skip to content

Commit 9276cf0

Browse files
app: Query initial-account-id while handling initial routes
This avoids a potential race if the queried account is logged out between the invocation of `_ZulipAppState.build` and `MaterialApp.onGenerateInitialRoutes`.
1 parent 8995493 commit 9276cf0

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

lib/widgets/app.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,6 @@ class _ZulipAppState extends State<ZulipApp> with WidgetsBindingObserver {
178178
return GlobalStoreWidget(
179179
child: Builder(builder: (context) {
180180
final globalStore = GlobalStoreWidget.of(context);
181-
// TODO(#524) choose initial account as last one used
182-
final initialAccountId = globalStore.accounts.firstOrNull?.id;
183181
return MaterialApp(
184182
title: 'Zulip',
185183
localizationsDelegates: ZulipLocalizations.localizationsDelegates,
@@ -207,6 +205,8 @@ class _ZulipAppState extends State<ZulipApp> with WidgetsBindingObserver {
207205
onGenerateRoute: (_) => null,
208206

209207
onGenerateInitialRoutes: (_) {
208+
// TODO(#524) choose initial account as last one used
209+
final initialAccountId = globalStore.accounts.firstOrNull?.id;
210210
return [
211211
if (initialAccountId == null)
212212
MaterialWidgetRoute(page: const ChooseAccountPage())

0 commit comments

Comments
 (0)